Vanilla/artemis
1
0
Fork 0
forked from Hay1tsme/artemis
Code Pull Requests Activity

idz: pretty up no key message, fix double handshake

Browse Source
This commit is contained in:
Hay1tsme
2025-09-20 16:07:30 -04:00
parent 5ec6cc0398
commit dd546dcce2
2 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
titles/idz/index.py
View File

@ -22,6 +22,7 @@ class IDZServlet(BaseServlet):
def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None:
super().__init__(core_cfg, cfg_dir) super().__init__(core_cfg, cfg_dir)
self.game_cfg = IDZConfig() self.game_cfg = IDZConfig()
self.rsa_keys: List[IDZKey] = []
if path.exists(f"{cfg_dir}/{IDZConstants.CONFIG_NAME}"): if path.exists(f"{cfg_dir}/{IDZConstants.CONFIG_NAME}"):
self.game_cfg.update( self.game_cfg.update(
yaml.safe_load(open(f"{cfg_dir}/{IDZConstants.CONFIG_NAME}")) yaml.safe_load(open(f"{cfg_dir}/{IDZConstants.CONFIG_NAME}"))
@ -38,8 +39,6 @@ class IDZServlet(BaseServlet):
backupCount=10, backupCount=10,
) )
self.rsa_keys: List[IDZKey] = []
fileHandler.setFormatter(log_fmt) fileHandler.setFormatter(log_fmt)
consoleHandler = logging.StreamHandler() consoleHandler = logging.StreamHandler()
@ -79,7 +78,32 @@ class IDZServlet(BaseServlet):
return False return False
if len(game_cfg.rsa_keys) <= 0 or not game_cfg.server.aes_key: if len(game_cfg.rsa_keys) <= 0 or not game_cfg.server.aes_key:
logging.getLogger("idz").error("IDZ: No RSA/AES keys! IDZ cannot start") logger = logging.getLogger("idz")
if not hasattr(logger, "inited"):
log_fmt_str = "[%(asctime)s] IDZ | %(levelname)s | %(message)s"
log_fmt = logging.Formatter(log_fmt_str)
fileHandler = TimedRotatingFileHandler(
"{0}/{1}.log".format(core_cfg.server.log_dir, "idz"),
encoding="utf8",
when="d",
backupCount=10,
)
fileHandler.setFormatter(log_fmt)
consoleHandler = logging.StreamHandler()
consoleHandler.setFormatter(log_fmt)
logger.addHandler(fileHandler)
logger.addHandler(consoleHandler)
logger.setLevel(game_cfg.server.loglevel)
coloredlogs.install(
level=game_cfg.server.loglevel, logger=logger, fmt=log_fmt_str
)
logger.inited = True
logger.error("No RSA/AES keys! IDZ cannot start")
return False return False
return True return True

5
titles/idz/userdb.py
View File

@ -53,8 +53,10 @@ class IDZUserDB:
async def connection_cb(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter): async def connection_cb(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
self.logger.debug(f"Connection made from {writer.get_extra_info('peername')[0]}") self.logger.debug(f"Connection made from {writer.get_extra_info('peername')[0]}")
sent_handshake = False
while True: while True:
try: try:
if not sent_handshake:
base = 0 base = 0
for i in range(len(self.static_key) - 1): for i in range(len(self.static_key) - 1):
@ -75,6 +77,7 @@ class IDZUserDB:
writer.write(result) writer.write(result)
await writer.drain() await writer.drain()
sent_handshake = True
data: bytes = await reader.read(4096) data: bytes = await reader.read(4096)
if len(data) == 0: if len(data) == 0:
@ -88,7 +91,7 @@ class IDZUserDB:
self.logger.debug("Connection reset, disconnecting") self.logger.debug("Connection reset, disconnecting")
return return
def dataReceived(self, data: bytes, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None: async def dataReceived(self, data: bytes, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
self.logger.debug(f"Receive data {data.hex()}") self.logger.debug(f"Receive data {data.hex()}")
client_ip = writer.get_extra_info('peername')[0] client_ip = writer.get_extra_info('peername')[0]
crypt = AES.new(self.static_key, AES.MODE_ECB) crypt = AES.new(self.static_key, AES.MODE_ECB)