From 47f4aaddf8742224600ecc99fafe34b3686565ad Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 23 Apr 2023 19:00:30 -0400 Subject: [PATCH] allnet: add download order infrastructure --- core/allnet.py | 29 ++++++++++++++++++++++++++--- core/config.py | 5 +++++ index.py | 17 +++++++++++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index b7cc4c6..5c10735 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -10,6 +10,7 @@ from Crypto.PublicKey import RSA from Crypto.Hash import SHA from Crypto.Signature import PKCS1_v1_5 from time import strptime +from os import path from core.config import CoreConfig from core.utils import Utils @@ -191,12 +192,34 @@ class AllnetServlet: self.logger.info(f"DownloadOrder from {request_ip} -> {req.game_id} v{req.ver} serial {req.serial}") resp = AllnetDownloadOrderResponse() - if not self.config.allnet.allow_online_updates: + if not self.config.allnet.allow_online_updates or not self.config.allnet.update_cfg_folder: return self.dict_to_http_form_string([vars(resp)]) - else: # TODO: Actual dlorder response + else: # TODO: Keychip check + if path.exists(f"{self.config.allnet.update_cfg_folder}/{req.game_id}-{req.ver}-app.ini"): + resp.uri = f"http://{self.config.title.hostname}:{self.config.title.port}/dl/ini/{req.game_id}-{req.ver}-app.ini" + + if path.exists(f"{self.config.allnet.update_cfg_folder}/{req.game_id}-{req.ver}-opt.ini"): + resp.uri += f"|http://{self.config.title.hostname}:{self.config.title.port}/dl/ini/{req.game_id}-{req.ver}-opt.ini" + + self.logger.debug(f"Sending download uri {resp.uri}") return self.dict_to_http_form_string([vars(resp)]) + def handle_dlorder_ini(self, request:Request, match: Dict) -> bytes: + if "file" not in match: return b"" + + req_file = match['file'].replace('%0A', '') + + if path.exists(f"{self.config.allnet.update_cfg_folder}/{req_file}"): + return open(f"{self.config.allnet.update_cfg_folder}/{req_file}", "rb").read() + + self.logger.info(f"DL INI File {req_file} not found") + return b"" + + def handle_dlorder_report(self, request:Request, match: Dict) -> bytes: + self.logger.info(f"DLI Report from {Utils.get_ip_addr(request)}: {request.content.getvalue()}") + return b"" + def handle_billing_request(self, request: Request, _: Dict): req_dict = self.billing_req_to_dict(request.content.getvalue()) request_ip = Utils.get_ip_addr(request) @@ -419,7 +442,7 @@ class AllnetDownloadOrderRequest: class AllnetDownloadOrderResponse: - def __init__(self, stat: int = 1, serial: str = "", uri: str = "null") -> None: + def __init__(self, stat: int = 1, serial: str = "", uri: str = "") -> None: self.stat = stat self.serial = serial self.uri = uri diff --git a/core/config.py b/core/config.py index 9e152c0..84311af 100644 --- a/core/config.py +++ b/core/config.py @@ -188,6 +188,11 @@ class AllnetConfig: self.__config, "core", "allnet", "allow_online_updates", default=False ) + @property + def update_cfg_folder(self) -> str: + return CoreConfig.get_config_field( + self.__config, "core", "allnet", "update_cfg_folder", default="" + ) class BillingConfig: def __init__(self, parent_config: "CoreConfig") -> None: diff --git a/index.py b/index.py index be48ac4..1e1193a 100644 --- a/index.py +++ b/index.py @@ -25,6 +25,22 @@ class HttpDispatcher(resource.Resource): self.allnet = AllnetServlet(cfg, config_dir) self.title = TitleServlet(cfg, config_dir) self.mucha = MuchaServlet(cfg, config_dir) + + self.map_get.connect( + "allnet_downloadorder_ini", + "/dl/ini/{file}", + controller="allnet", + action="handle_dlorder_ini", + conditions=dict(method=["GET"]), + ) + + self.map_post.connect( + "allnet_downloadorder_report", + "/dl/report", + controller="allnet", + action="handle_dlorder_report", + conditions=dict(method=["POST"]), + ) self.map_post.connect( "allnet_ping", @@ -93,6 +109,7 @@ class HttpDispatcher(resource.Resource): conditions=dict(method=["POST"]), requirements=dict(game=R"S..."), ) + def render_GET(self, request: Request) -> bytes: self.logger.debug(request.uri)