Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions modules/soc_leaf/pycarwings2.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,25 @@
from datetime import date
from responses import *
import base64
from Crypto.Cipher import Blowfish
from Crypto.Cipher import AES
from Crypto.Util.Padding import pad

BASE_URL = "https://gdcportalgw.its-mo.com/api_v230317_NE/gdc/"
BASE_URL = "https://gdcportalgw.its-mo.com/api_v250205_NE/gdc/"

# New AES login constants
AES_KEY = "H9YsaE6mr3jBEsAaLC4EJRjn9VXEtTzV"
AES_IV = "xaX4ui2PLnwqcc74"

log = logging.getLogger(__name__)


# from http://stackoverflow.com/questions/17134100/python-blowfish-encryption
def _PKCS5Padding(string):
byteNum = len(string)
packingLength = 8 - byteNum % 8
appendage = chr(packingLength) * packingLength
return string + appendage
def encrypt_aes_password(password: str) -> str:
key = AES_KEY.encode("utf-8")
iv = AES_IV.encode("utf-8")
cipher = AES.new(key, AES.MODE_CBC, iv)
padded = pad(password.encode("utf-8"), AES.block_size)
encrypted = cipher.encrypt(padded)
return base64.standard_b64encode(encrypted).decode("utf-8")


class CarwingsError(Exception):
Expand Down Expand Up @@ -175,10 +181,7 @@ def connect(self):
})
ret = CarwingsInitialAppResponse(response)

c1 = Blowfish.new(ret.baseprm.encode(), Blowfish.MODE_ECB)
packedPassword = _PKCS5Padding(self.password)
encryptedPassword = c1.encrypt(packedPassword.encode())
encodedPassword = base64.standard_b64encode(encryptedPassword)
encodedPassword = encrypt_aes_password(self.password)

response = self._request("UserLoginRequest.php", {
"RegionCode": self.region_code,
Expand Down
Loading