Fix proxy logging (#66)

Author: jschlyter

dnstapir/starlette.py

@@ -15,10 +15,10 @@ async def dispatch(self, request: Request, call_next: Callable[[Request], Awaita
         logger = structlog.get_logger()
         request_id = str(uuid.uuid4())
 
-        remote = (
+        remote: dict[str, str | int | None] = (
             {
-                "client_host": str(request.client.host),
-                "client_port": str(request.client.port),
+                "client_host": request.client.host,
+                "client_port": request.client.port or None,
             }
             if request.client
             else {}

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dnstapir"
-version = "1.5.0"
+version = "1.5.1"
 description = "DNS TAPIR Python Library"
 authors = ["Jakob Schlyter <[email protected]>"]
 readme = "README.md"
@@ -31,6 +31,7 @@ pytest-ruff = "^0.4.1"
 fakeredis = "^2.25.1"
 pytest-httpx = "^0.34.0"
 aiobotocore = "^2.19.0"
+uvicorn = "^0.34.0"
 
 [tool.poetry.extras]
 keymanager = [

pyproject.toml

@@ -0,0 +1,20 @@
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from uvicorn.middleware.proxy_headers import ProxyHeadersMiddleware
+
+from dnstapir.starlette import LoggingMiddleware
+
+
+def test_starlette():
+    app = FastAPI()
+    app.add_middleware(LoggingMiddleware)
+    client = TestClient(app, client=("127.0.0.1", "1984"), headers={"X-Forwarded-For": "10.0.0.1"})
+    client.get("/")
+
+
+def test_starlette_proxy():
+    app = FastAPI()
+    app.add_middleware(LoggingMiddleware)
+    app.add_middleware(ProxyHeadersMiddleware, trusted_hosts=["127.0.0.1"])
+    client = TestClient(app, client=("127.0.0.1", 1984), headers={"X-Forwarded-For": "10.0.0.1"})
+    client.get("/proxy")