From ffc0f2fa5e2f3b855643110bbb5cb60b190024ad Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 30 Nov 2023 18:17:40 -0500 Subject: [PATCH] add keychip ID to auth key --- core/aimedb.py | 4 ++-- core/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/aimedb.py b/core/aimedb.py index 211da5f..1945b20 100644 --- a/core/aimedb.py +++ b/core/aimedb.py @@ -182,7 +182,7 @@ class AimedbProtocol(Protocol): ) if user_id and user_id > 0 and self.config.aimedb.id_secret: - auth_key = create_sega_auth_key(user_id, req.head.game_id, req.head.store_id, self.config.aimedb.id_secret) + auth_key = create_sega_auth_key(user_id, req.head.game_id, req.head.store_id, req.head.keychip_id, self.config.aimedb.id_secret) if auth_key is not None: auth_key_extra_len = 256 - len(auth_key) auth_key_full = auth_key.encode() + (b"\0" * auth_key_extra_len) @@ -254,7 +254,7 @@ class AimedbProtocol(Protocol): resp = ADBFelicaLookup2Response.from_req(req.head, user_id, access_code) if user_id and user_id > 0 and self.config.aimedb.id_secret: - auth_key = create_sega_auth_key(user_id, req.head.game_id, req.head.store_id, self.config.aimedb.id_secret) + auth_key = create_sega_auth_key(user_id, req.head.game_id, req.head.store_id, req.head.keychip_id, self.config.aimedb.id_secret) if auth_key is not None: auth_key_extra_len = 256 - len(auth_key) auth_key_full = auth_key.encode() + (b"\0" * auth_key_extra_len) diff --git a/core/utils.py b/core/utils.py index 3569f57..bdde5f4 100644 --- a/core/utils.py +++ b/core/utils.py @@ -64,10 +64,10 @@ class Utils: return cls.real_title_port_ssl -def create_sega_auth_key(aime_id: int, game: str, place_id: int, b64_secret: str, err_logger: str = 'aimedb') -> Optional[str]: +def create_sega_auth_key(aime_id: int, game: str, place_id: int, keychip_id: str, b64_secret: str, err_logger: str = 'aimedb') -> Optional[str]: logger = logging.getLogger(err_logger) try: - return jwt.encode({ "aime_id": aime_id, "game": game, "place_id": place_id, "exp": int(datetime.now(tz=timezone.utc).timestamp()) + 86400 }, b64decode(b64_secret), algorithm="HS256") + return jwt.encode({ "aime_id": aime_id, "game": game, "place_id": place_id, "keychip_id": keychip_id, "exp": int(datetime.now(tz=timezone.utc).timestamp()) + 86400 }, b64decode(b64_secret), algorithm="HS256") except jwt.InvalidKeyError: logger.error("Failed to encode Sega Auth Key because the secret is invalid!") return None