Bennett/artemis
1
0
Fork 0
mirror of https://gitea.tendokyu.moe/Hay1tsme/artemis.git synced 2026-02-15 20:27:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

clean up index.py

Browse Source
This commit is contained in:
Hay1tsme
2023-02-26 11:40:13 -05:00
parent 2b81ba206c
commit 56927c049f
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
titles/diva/index.py
View File

@@ -44,7 +44,6 @@ class DivaServlet():
if "THIS_STRING_SEPARATES" in str(url_header):
binary_request = req_raw.splitlines()
binary_cmd_decoded = binary_request[3].decode("utf-8")
self.logger.debug(f"Binary request {binary_request}")
req_cls = BaseBinaryRequest(binary_cmd_decoded)
@@ -54,18 +53,19 @@ class DivaServlet():
gz_string = base64.b64decode(b64string) # Decompressing the base64 string
try:
url_data = zlib.decompress( gz_string ).decode("utf-8", errors="replace") # Decompressing the gzip
url_data = zlib.decompress( gz_string ) # Decompressing the gzip
except zlib.error as e:
self.logger.error(f"Failed to defalte! {e} -> {gz_string}")
return "stat=0"
return b"stat=0"
try:
req_cls = BaseRequest(url_data)
except DivaRequestParseException as e:
self.logger.error(e)
return b""
return b"stat=0"
self.logger.debug(f"Request: {req_cls.raw_dict}\nHeaders: {url_header}")
self.logger.debug(f"Request: {req_raw}\nHeaders: {url_header}")
self.logger.info(f"{req_cls.cmd} request from {req_cls.b_serial} at {req.getClientAddress().host}")
handler_str = f"handle_{req_cls.cmd}_request"
@@ -74,4 +74,10 @@ class DivaServlet():
return BaseResponse(req_cls.cmd, req_cls.req_id).make().encode()
handler = getattr(self.base, handler_str)
return handler(req_cls.raw).encode(errors="ignore")
response = handler(req_cls.raw)
if response is None or response == "":
response = BaseResponse(req_cls.cmd, req_cls.req_id).make()
self.logger.debug(f"Response: {response}")
return response.encode(errors="ignore")