From f99317b2782fda9ff6104dd3150d459975fca1c5 Mon Sep 17 00:00:00 2001
From: Tom van der Lee <tom@vanderlee.io>
Date: Fri, 18 Nov 2022 14:00:44 +0100
Subject: Added feature to change the proxy host

---
 ttun/__main__.py |  18 +++++++-
 ttun/client.py   | 138 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 91 insertions(+), 65 deletions(-)

diff --git a/ttun/__main__.py b/ttun/__main__.py
index cee662a..cbf8e16 100644
--- a/ttun/__main__.py
+++ b/ttun/__main__.py
@@ -27,12 +27,26 @@ def main():
         default=None,
         help="The subdomain of the ttun tunnel",
     )
+    parser.add_argument(
+        "-t",
+        "--to",
+        default="127.0.0.1",
+        help="The host to proxy the request to",
+    )
+    parser.add_argument(
+        "--https",
+        help="Use this if the proxied server uses https",
+        action="store_true",
+        default=False,
+    )
     args = parser.parse_args()
 
     client = Client(
         port=args.port,
         subdomain=args.subdomain,
         server=args.server,
+        to=args.to,
+        https=args.https,
     )
 
     try:
@@ -45,14 +59,14 @@ def main():
 
     def print_info(server: Server):
         print("Tunnel created:")
-        print(f'{client.config["url"]} -> http://localhost:{args.port}')
+        print(f'{client.config["url"]} -> {client.proxy_origin}')
         print("")
         print(f"Inspect requests:")
         print(f"http://localhost:{server.port}")
 
     server = Server(
         config=client.config,
-        on_resend=client.proxyRequest,
+        on_resend=client.proxy_request,
         on_started=print_info,
     )
 
diff --git a/ttun/client.py b/ttun/client.py
index 6d05da7..9e597ab 100644
--- a/ttun/client.py
+++ b/ttun/client.py
@@ -25,14 +25,22 @@ from ttun.types import ResponseData
 
 
 class Client:
-    def __init__(self, port: int, server: str, subdomain: str = None):
-        self.port = port
+    def __init__(
+        self,
+        port: int,
+        server: str,
+        subdomain: str = None,
+        to: str = "127.0.0.1",
+        https: bool = False,
+    ):
         self.server = server
         self.subdomain = subdomain
 
         self.config: Optional[Config] = None
         self.connection: WebSocketClientProtocol = None
 
+        self.proxy_origin = f'{"https" if https else "http"}://{to}:{port}'
+
     async def send(self, data: dict):
         await self.connection.send(json.dumps(data))
 
@@ -65,73 +73,77 @@ class Client:
             return self.connection
 
     async def handle_messages(self):
-        while True:
-            try:
-                request: RequestData = await self.receive()
-                await self.proxy_request(
-                    request=request, on_response=lambda response: self.send(response)
-                )
-
-            except ConnectionClosed:
-                break
+        async with ClientSession(
+            base_url=self.proxy_origin, cookie_jar=DummyCookieJar()
+        ) as session:
+            while True:
+                try:
+                    request: RequestData = await self.receive()
+                    await self.proxy_request(
+                        session=session,
+                        request=request,
+                        on_response=lambda response: self.send(response),
+                    )
+                except ConnectionClosed:
+                    break
 
     async def proxy_request(
         self,
+        session: ClientSession,
         request: RequestData,
         on_response: Callable[[ResponseData], Awaitable] = None,
     ):
-        async with ClientSession(cookie_jar=DummyCookieJar()) as session:
-            request_id = uuid4()
-            await PubSub.publish(
-                {
-                    "type": "request",
-                    "payload": {
-                        "id": request_id.hex,
-                        "timestamp": datetime.now().isoformat(),
-                        **request,
-                    },
-                }
+        request_id = uuid4()
+        await PubSub.publish(
+            {
+                "type": "request",
+                "payload": {
+                    "id": request_id.hex,
+                    "timestamp": datetime.now().isoformat(),
+                    **request,
+                },
+            }
+        )
+
+        start = perf_counter()
+        try:
+            response = await session.request(
+                method=request["method"],
+                url=request["path"],
+                headers=request["headers"],
+                data=b64decode(request["body"].encode()),
+                allow_redirects=False,
             )
+            end = perf_counter()
+
+            response_data = ResponseData(
+                status=response.status,
+                headers=[
+                    (key, value)
+                    for key, value in response.headers.items()
+                    if key.lower() not in ["transfer-encoding", "content-encoding"]
+                ],
+                body=b64encode(await response.read()).decode(),
+            )
+        except ClientError as e:
+            end = perf_counter()
 
-            start = perf_counter()
-            try:
-                response = await session.request(
-                    method=request["method"],
-                    url=f'http://localhost:{self.port}{request["path"]}',
-                    headers=request["headers"],
-                    data=b64decode(request["body"].encode()),
-                    allow_redirects=False,
-                )
-                end = perf_counter()
-
-                response_data = ResponseData(
-                    status=response.status,
-                    headers=[
-                        (key, value)
-                        for key, value in response.headers.items()
-                        if key.lower() not in ["transfer-encoding", "content-encoding"]
-                    ],
-                    body=b64encode(await response.read()).decode(),
-                )
-            except ClientError as e:
-                end = perf_counter()
-
-                response_data = ResponseData(
-                    status=(504 if isinstance(e, ClientConnectionError) else 502),
-                    headers=[("content-type", "text/plain")],
-                    body=b64encode(str(e).encode()).decode(),
-                )
-
-            if on_response is not None:
-                await on_response(response_data)
-
-            await PubSub.publish(
-                {
-                    "type": "response",
-                    "payload": {
-                        "id": request_id.hex,
-                        "timing": end - start,
-                        **response_data,
-                    },
-                }
+            response_data = ResponseData(
+                status=(504 if isinstance(e, ClientConnectionError) else 502),
+                headers=[("content-type", "text/plain")],
+                body=b64encode(str(e).encode()).decode(),
             )
+
+        if on_response is not None:
+            await on_response(response_data)
+
+        await PubSub.publish(
+            {
+                "type": "response",
+                "payload": {
+                    "id": request_id.hex,
+                    "timing": end - start,
+                    **response_data,
+                },
+            }
+        )
-- 
cgit v1.2.3