fixing ongeki handler

example_config/sao.yaml

@@ -1,6 +1,13 @@
 server:
-  hostname: "localhost"
   enable: True
   loglevel: "info"
-  port: 9000
-  auto_register: True
+  auto_register: True
+
+crypt:
+  enable: False
+  key: ""
+  iv: ""
+
+hash:
+  verify_hash: False
+  hash_base: ""

titles/ongeki/index.py

@@ -252,7 +252,7 @@ class OngekiServlet(BaseServlet):
 
         zipped = zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8"))
 
-        if not encrtped and version < 120:
+        if not encrtped or version < 120:
             return zipped
 
         padded = pad(zipped, 16)

titles/sao/config.py

@@ -5,12 +5,6 @@ class SaoServerConfig:
     def __init__(self, parent_config: "SaoConfig"):
         self.__config = parent_config
 
-    @property
-    def hostname(self) -> str:
-        return CoreConfig.get_config_field(
-            self.__config, "sao", "server", "hostname", default="localhost"
-        )
-
     @property
     def enable(self) -> bool:
         return CoreConfig.get_config_field(
@@ -25,12 +19,6 @@ class SaoServerConfig:
             )
         )
 
-    @property
-    def port(self) -> int:
-        return CoreConfig.get_config_field(
-            self.__config, "sao", "server", "port", default=9000
-        )
-
     @property
     def auto_register(self) -> bool:
         """
@@ -41,7 +29,47 @@ class SaoServerConfig:
             self.__config, "sao", "server", "auto_register", default=True
         )
 
+class SaoCryptConfig:
+    def __init__(self, parent_config: "SaoConfig"):
+        self.__config = parent_config
+    
+    @property
+    def enable(self) -> bool:
+        return CoreConfig.get_config_field(
+            self.__config, "sao", "crypt", "enable", default=False
+        )
+    
+    @property
+    def key(self) -> str:
+        return CoreConfig.get_config_field(
+            self.__config, "sao", "crypt", "key", default=""
+        )
+    
+    @property
+    def iv(self) -> str:
+        return CoreConfig.get_config_field(
+            self.__config, "sao", "crypt", "iv", default=""
+        )
+
+class SaoHashConfig:
+    def __init__(self, parent_config: "SaoConfig"):
+        self.__config = parent_config
+        
+    @property
+    def verify_hash(self) -> bool:
+        return CoreConfig.get_config_field(
+            self.__config, "sao", "hash", "verify_hash", default=False
+        )
+    
+    @property
+    def hash_base(self) -> str:
+        return CoreConfig.get_config_field(
+            self.__config, "sao", "hash", "hash_base", default=""
+        )
+
 
 class SaoConfig(dict):
     def __init__(self) -> None:
         self.server = SaoServerConfig(self)
+        self.crypt = SaoCryptConfig(self)
+        self.hash = SaoHashConfig(self)

titles/sao/handlers/__init__.py

@@ -1 +1,2 @@
-from titles.sao.handlers.base import *
+from .base import *
+from .helpers import *

titles/sao/handlers/base.py

@@ -1,14 +1,26 @@
 import struct
 from datetime import datetime
 from construct import *
-import sys
+from .helpers import *
 import csv
 from csv import *
 
-class SaoBaseRequest:
+class SaoRequestHeader:
     def __init__(self, data: bytes) -> None:
-        self.cmd = struct.unpack_from("!H", bytes)[0]
-        # TODO: The rest of the request header
+        collection = struct.unpack_from("!H6xIII16sI", data)
+        self.cmd: int = collection[0]
+        self.vendor_id: int = collection[1]
+        self.game_id: int = collection[2]
+        self.version_id: int = collection[3]
+        self.hash: str = collection[4]
+        self.data_len: str = collection[5]
+
+class SaoBaseRequest:
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        self.header = header
+        if self.header.data_len != len(data):
+            logging.getLogger('sao').error(f"Expected {self.header.data_len} data bytes byt got {len(data)}!")
+            # TODO: Raise an error here
 
 class SaoBaseResponse:
     def __init__(self, cmd_id: int) -> None:
@@ -33,8 +45,8 @@ class SaoNoopResponse(SaoBaseResponse):
         return super().make() + struct.pack("!bI", self.result, 0)
         
 class SaoGetMaintRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
         # TODO: The rest of the mait info request
 
 class SaoGetMaintResponse(SaoBaseResponse):
@@ -68,8 +80,8 @@ class SaoGetMaintResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoCommonAcCabinetBootNotificationRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoCommonAcCabinetBootNotificationResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -90,8 +102,8 @@ class SaoCommonAcCabinetBootNotificationResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoMasterDataVersionCheckRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoMasterDataVersionCheckResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -118,8 +130,8 @@ class SaoMasterDataVersionCheckResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoCommonGetAppVersionsRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoCommonGetAppVersionsRequest(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -154,8 +166,8 @@ class SaoCommonGetAppVersionsRequest(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoCommonPayingPlayStartRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoCommonPayingPlayStartRequest(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -181,8 +193,8 @@ class SaoCommonPayingPlayStartRequest(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetAuthCardDataRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetAuthCardDataResponse(SaoBaseResponse): #GssSite.dll / GssSiteSystem / GameConnectProt / public class get_auth_card_data_R : GameConnect.GssProtocolBase
     def __init__(self, cmd, profile_data) -> None:
@@ -225,8 +237,8 @@ class SaoGetAuthCardDataResponse(SaoBaseResponse): #GssSite.dll / GssSiteSystem
         return super().make() + resp_data
 
 class SaoHomeCheckAcLoginBonusRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoHomeCheckAcLoginBonusResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -262,8 +274,8 @@ class SaoHomeCheckAcLoginBonusResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetQuestSceneMultiPlayPhotonServerRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetQuestSceneMultiPlayPhotonServerResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -289,8 +301,8 @@ class SaoGetQuestSceneMultiPlayPhotonServerResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoTicketRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoTicketResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -318,8 +330,8 @@ class SaoTicketResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoCommonLoginRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoCommonLoginResponse(SaoBaseResponse):
     def __init__(self, cmd, profile_data) -> None:
@@ -362,8 +374,8 @@ class SaoCommonLoginResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoCheckComebackEventRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoCheckComebackEventRequest(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -392,8 +404,8 @@ class SaoCheckComebackEventRequest(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetUserBasicDataRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetUserBasicDataResponse(SaoBaseResponse):
     def __init__(self, cmd, profile_data) -> None:
@@ -476,8 +488,8 @@ class SaoGetUserBasicDataResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetHeroLogUserDataListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetHeroLogUserDataListResponse(SaoBaseResponse):
     def __init__(self, cmd, hero_data) -> None:
@@ -654,8 +666,8 @@ class SaoGetHeroLogUserDataListResponse(SaoBaseResponse):
         return super().make() + resp_data
     
 class SaoGetEquipmentUserDataListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetEquipmentUserDataListResponse(SaoBaseResponse):
     def __init__(self, cmd, equipment_data) -> None:
@@ -810,8 +822,8 @@ class SaoGetEquipmentUserDataListResponse(SaoBaseResponse):
         return super().make() + resp_data
     
 class SaoGetItemUserDataListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetItemUserDataListResponse(SaoBaseResponse):
     def __init__(self, cmd, item_data) -> None:
@@ -874,8 +886,8 @@ class SaoGetItemUserDataListResponse(SaoBaseResponse):
         return super().make() + resp_data
     
 class SaoGetSupportLogUserDataListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetSupportLogUserDataListResponse(SaoBaseResponse):
     def __init__(self, cmd, supportIdsData) -> None:
@@ -945,8 +957,8 @@ class SaoGetSupportLogUserDataListResponse(SaoBaseResponse):
         return super().make() + resp_data
     
 class SaoGetTitleUserDataListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetTitleUserDataListResponse(SaoBaseResponse):
     def __init__(self, cmd, titleIdsData) -> None:
@@ -993,8 +1005,8 @@ class SaoGetTitleUserDataListResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetEpisodeAppendDataListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetEpisodeAppendDataListResponse(SaoBaseResponse):
     def __init__(self, cmd, profile_data) -> None:
@@ -1051,8 +1063,8 @@ class SaoGetEpisodeAppendDataListResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetPartyDataListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetPartyDataListResponse(SaoBaseResponse): # Default party 
     def __init__(self, cmd, hero1_data, hero2_data, hero3_data) -> None:
@@ -1215,8 +1227,8 @@ class SaoGetPartyDataListResponse(SaoBaseResponse): # Default party
         return super().make() + resp_data
     
 class SaoGetQuestScenePrevScanProfileCardRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetQuestScenePrevScanProfileCardResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -1352,8 +1364,8 @@ class SaoGetQuestScenePrevScanProfileCardResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetResourcePathInfoRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetResourcePathInfoResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -1394,8 +1406,8 @@ class SaoGetResourcePathInfoResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoEpisodePlayStartRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoEpisodePlayStartResponse(SaoBaseResponse):
     def __init__(self, cmd, profile_data) -> None:
@@ -1441,8 +1453,8 @@ class SaoEpisodePlayStartResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoEpisodePlayEndRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoEpisodePlayEndResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -1529,8 +1541,8 @@ class SaoEpisodePlayEndResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoTrialTowerPlayEndRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoTrialTowerPlayEndResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -1655,8 +1667,8 @@ class SaoTrialTowerPlayEndResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoEpisodePlayEndUnanalyzedLogFixedRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoEpisodePlayEndUnanalyzedLogFixedResponse(SaoBaseResponse):
     def __init__(self, cmd, end_session_data) -> None:
@@ -1735,8 +1747,8 @@ class SaoEpisodePlayEndUnanalyzedLogFixedResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetQuestSceneUserDataListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetQuestSceneUserDataListResponse(SaoBaseResponse):
     def __init__(self, cmd, quest_data) -> None:
@@ -1844,8 +1856,8 @@ class SaoGetQuestSceneUserDataListResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoCheckYuiMedalGetConditionRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoCheckYuiMedalGetConditionResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -1875,8 +1887,8 @@ class SaoCheckYuiMedalGetConditionResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetYuiMedalBonusUserDataRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetYuiMedalBonusUserDataResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -1920,8 +1932,8 @@ class SaoGetYuiMedalBonusUserDataResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoCheckProfileCardUsedRewardRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoCheckProfileCardUsedRewardResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -1952,8 +1964,8 @@ class SaoCheckProfileCardUsedRewardResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoSynthesizeEnhancementHeroLogRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoSynthesizeEnhancementHeroLogResponse(SaoBaseResponse):
     def __init__(self, cmd, hero_data) -> None:
@@ -2107,8 +2119,8 @@ class SaoSynthesizeEnhancementHeroLogResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoSynthesizeEnhancementEquipment(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoSynthesizeEnhancementEquipmentResponse(SaoBaseResponse):
     def __init__(self, cmd, synthesize_equipment_data) -> None:
@@ -2244,8 +2256,8 @@ class SaoSynthesizeEnhancementEquipmentResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetDefragMatchBasicDataRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetDefragMatchBasicDataResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -2291,8 +2303,8 @@ class SaoGetDefragMatchBasicDataResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetDefragMatchRankingUserDataRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetDefragMatchRankingUserDataResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -2351,8 +2363,8 @@ class SaoGetDefragMatchRankingUserDataResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetDefragMatchLeaguePointRankingListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetDefragMatchLeaguePointRankingListResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -2423,8 +2435,8 @@ class SaoGetDefragMatchLeaguePointRankingListResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoGetDefragMatchLeagueScoreRankingListRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoGetDefragMatchLeagueScoreRankingListResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -2495,8 +2507,8 @@ class SaoGetDefragMatchLeagueScoreRankingListResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoBnidSerialCodeCheckRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoBnidSerialCodeCheckResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -2526,8 +2538,8 @@ class SaoBnidSerialCodeCheckResponse(SaoBaseResponse):
         return super().make() + resp_data
 
 class SaoScanQrQuestProfileCardRequest(SaoBaseRequest):
-    def __init__(self, data: bytes) -> None:
-        super().__init__(data)
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
 
 class SaoScanQrQuestProfileCardResponse(SaoBaseResponse):
     def __init__(self, cmd) -> None:
@@ -2741,4 +2753,26 @@ class SaoScanQrQuestProfileCardResponse(SaoBaseResponse):
         resp_data = resp_struct.build(resp_data)
 
         self.length = len(resp_data)
-        return super().make() + resp_data
+        return super().make() + resp_data
+    
+class SaoConsumeCreditGuestRequest(SaoBaseRequest):
+    def __init__(self, header: SaoRequestHeader, data: bytes) -> None:
+        super().__init__(header, data)
+        off = 0
+        shop_id = decode_str(data, off)
+        self.shop_id = shop_id[0]
+        off += shop_id[1]
+        
+        serial_num = decode_str(data, off)
+        self.serial_num = serial_num[0]
+        off += serial_num[1]
+        
+        self.cab_type = decode_byte(data, off)
+        off += BYTE_OFF
+        
+        self.act_type = decode_byte(data, off)
+        off += BYTE_OFF
+        
+        self.consume_num = decode_byte(data, off)
+        off += BYTE_OFF
+        

titles/sao/handlers/helpers.py

@@ -0,0 +1,50 @@
+from typing import Tuple
+import struct
+import logging
+
+BIGINT_OFF = 16
+LONG_OFF = 8
+INT_OFF = 4
+SHORT_OFF = 2
+BYTE_OFF = 1
+
+def decode_num(data: bytes, offset: int, size: int) -> int:
+    try:
+        return int.from_bytes(data[offset:offset + size], 'big')
+    except:
+        logging.getLogger('sao').error(f"Failed to parse {data[offset:offset + size]} as BE number of width {size}")
+        return 0
+
+def decode_byte(data: bytes, offset: int) -> int:
+    return decode_num(data, offset, BYTE_OFF)
+
+def decode_short(data: bytes, offset: int) -> int:
+    return decode_num(data, offset, SHORT_OFF)
+
+def decode_int(data: bytes, offset: int) -> int:
+    return decode_num(data, offset, INT_OFF)
+
+def decode_long(data: bytes, offset: int) -> int:
+    return decode_num(data, offset, LONG_OFF)
+
+def decode_bigint(data: bytes, offset: int) -> int:
+    return decode_num(data, offset, BIGINT_OFF)
+
+def decode_str(data: bytes, offset: int) -> Tuple[str, int]:
+    try:
+        str_len = decode_int(data, offset)
+        num_bytes_decoded = INT_OFF + str_len
+        str_out = data[offset + INT_OFF:offset + num_bytes_decoded].decode("utf-16-le", errors="replace")
+        return (str_out, num_bytes_decoded)
+    except:
+        logging.getLogger('sao').error(f"Failed to parse {data[offset:]} as string!")
+        return ("", 0)
+
+def encode_str(s: str) -> bytes:
+    try:
+        str_bytes = s.encode("utf-16-le", errors="replace")
+        str_len_bytes = struct.pack("!I", len(str_bytes))
+        return str_len_bytes + str_bytes
+    except:
+        logging.getLogger('sao').error(f"Failed to encode {s} as bytes!")
+        return b""

titles/sao/index.py

@@ -4,6 +4,8 @@ import yaml
 import logging, coloredlogs
 from logging.handlers import TimedRotatingFileHandler
 from os import path
+from Crypto.Cipher import Blowfish
+from hashlib import md5
 
 from core import CoreConfig, Utils
 from core.title import BaseServlet
@@ -47,11 +49,15 @@ class SaoServlet(BaseServlet):
             self.logger.inited = True
 
         self.base = SaoBase(core_cfg, self.game_cfg)
+        self.static_hash = None
+        
+        if self.game_cfg.hash.verify_hash:
+            self.static_hash = md5(self.game_cfg.hash.hash_base) # Greate hashing guys, really validates the data
     
     def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
         return (
             [], 
-            [("render_POST", "/SaoServlet/{datecode}/proto/if/{endpoint}", {})]
+            [("render_POST", "/{datecode}/proto/if/{category}/{endpoint}", {})]
         )
     
     @classmethod
@@ -69,9 +75,10 @@ class SaoServlet(BaseServlet):
         return True
     
     def get_allnet_info(self, game_code: str, game_ver: int, keychip: str) -> Tuple[str, str]:
+        tport = Utils.get_title_port(self.core_cfg)
         return (
-            f"http://{self.game_cfg.server.hostname}:{self.game_cfg.server.port}/SaoServlet/",
-            f"{self.game_cfg.server.hostname}/SaoServlet/",
+            f"http://{self.core_cfg.title.hostname}:{tport}/",
+            f"{self.core_cfg.title.hostname}/",
         )
 
     def get_mucha_info(self, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str]:
@@ -85,17 +92,36 @@ class SaoServlet(BaseServlet):
         endpoint = matchers.get('endpoint', '')
         request.responseHeaders.addRawHeader(b"content-type", b"text/html; charset=utf-8")
 
-        sao_request = request.content.getvalue().hex()
+        req_raw = request.content.read()
+        sao_request = req_raw.hex()
+        req_header = SaoRequestHeader(req_raw)
+        
+        cmd_str = f"{req_header.cmd:04x}"
+        
+        if self.game_cfg.hash.verify_hash and self.static_hash != req_header.hash:
+            self.logger.error(f"Hash mismatch! Expecting {self.static_hash} but recieved {req_header.hash}")
+            return b""
+        
+        if self.game_cfg.crypt.enable:
+            
+            iv = req_raw[40:48]
+            cipher = Blowfish.new(self.game_cfg.crypt.key, Blowfish.MODE_CBC, iv)
+            crypt_data = req_raw[48:]
+            req_data = cipher.decrypt(crypt_data)
+            self.logger.debug(f"Decrypted {req_data.hex()} with IV {iv.hex()}")
+            
+        else:
+            req_data = req_raw[40:]
 
-        handler = getattr(self.base, f"handle_{sao_request[:4]}", None)
+        handler = getattr(self.base, f"handle_{cmd_str}", None)
         if handler is None:
-            self.logger.info(f"Generic Handler for {endpoint} - {sao_request[:4]}")
+            self.logger.info(f"Generic Handler for {endpoint} - {cmd_str}")
             self.logger.debug(f"Request: {request.content.getvalue().hex()}")
-            resp = SaoNoopResponse(int.from_bytes(bytes.fromhex(sao_request[:4]), "big")+1)
+            resp = SaoNoopResponse(req_header.cmd + 1)
             self.logger.debug(f"Response: {resp.make().hex()}")
             return resp.make()
 
-        self.logger.info(f"Handler {endpoint} - {sao_request[:4]} request")
+        self.logger.info(f"Handler {endpoint} - {cmd_str} request")
         self.logger.debug(f"Request: {request.content.getvalue().hex()}")
         resp = handler(sao_request)
         self.logger.debug(f"Response: {resp.hex()}")