From d8ec9c9ea57d8133e278b6d5330d26e25aa19939 Mon Sep 17 00:00:00 2001 From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com> Date: Sun, 17 Dec 2023 20:35:16 -0500 Subject: [PATCH] Fix usage without a custom host --- pretendo_addon.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pretendo_addon.py b/pretendo_addon.py index 1271c55..11577ed 100644 --- a/pretendo_addon.py +++ b/pretendo_addon.py @@ -10,25 +10,25 @@ def load(self, loader) -> None: help="Redirect all requests from Nintendo to Pretendo", ) - loader.add_option( - name="pretendo_http", - typespec=bool, - default=False, - help="Sets Pretendo requests to HTTP", - ) - loader.add_option( name="pretendo_host", typespec=str, - default="pretendo.cc", + default="", help="Host to send Pretendo requests to (keeps the original host in the Host header)", ) + loader.add_option( + name="pretendo_http", + typespec=bool, + default=False, + help="Sets Pretendo requests to HTTP (only applies if pretendo_host is set)", + ) + loader.add_option( name="pretendo_host_port", typespec=int, default=80, - help="Port to send Pretendo requests to", + help="Port to send Pretendo requests to (only applies if pretendo_host is set)", ) def request(self, flow: http.HTTPFlow) -> None: @@ -38,14 +38,14 @@ def request(self, flow: http.HTTPFlow) -> None: elif 'nintendowifi.net' in flow.request.pretty_host: flow.request.host = flow.request.pretty_host.replace('nintendowifi.net', 'pretendo.cc') - if 'pretendo.cc' in flow.request.pretty_host: - flow.request.port = ctx.options.pretendo_host_port - + if 'pretendo.cc' in flow.request.pretty_host and ctx.options.pretendo_host: original_host = flow.request.host_header flow.request.host = ctx.options.pretendo_host flow.request.host_header = original_host - if ctx.options.pretendo_http: - flow.request.scheme = 'http' + flow.request.port = ctx.options.pretendo_host_port + + if ctx.options.pretendo_http: + flow.request.scheme = 'http' addons = [PretendoAddon()]