#684 Added check for if ip None

src/backend_api/app/api/deps.py

@@ -210,7 +210,12 @@ def get_username_by_request(request: Request) -> str:
 
 
 def get_user_ip_with_context(request: Request) -> str:  # noqa: ARG001
-    return context.data["X-Forwarded-For"]
+    local_host = request.client.host if request.client else "127.0.0.1"
+    return (
+        context.data["X-Forwarded-For"]
+        if context.data["X-Forwarded-For"]
+        else local_host
+    )
 
 
 def get_rate_limit_amount_by_tier(tier: int) -> int:

src/backend_api/app/api/routes/plot.py

@@ -43,12 +43,18 @@ async def get_plot_data(
         cooldown_seconds=rate_limit_settings.PLOT_RATE_LIMIT_COOLDOWN_SECONDS,
     )
 
+    client_ip = (
+        context.data["X-Forwarded-For"]
+        if context.data["X-Forwarded-For"]
+        else "127.0.0.1"
+    )
+
     async with apply_custom_rate_limit(
         unique_key="plot_" + get_username_by_request(request),
         rate_spec=rate_spec,
         prefix=plot_prefix,
     ), apply_custom_rate_limit(
-        unique_key="plot_" + context.data["X-Forwarded-For"],
+        unique_key="plot_" + client_ip,
         rate_spec=rate_spec,
         prefix=plot_prefix,
     ):

src/backend_api/app/api/routes/turnstile.py

@@ -37,7 +37,11 @@ async def get_turnstile_validation(
     )
 
     # Use a fallback IP if request.client is None (e.g., during testing)
-    client_ip = context.data["X-Forwarded-For"] if request.client else "127.0.0.1"
+    client_ip = (
+        context.data["X-Forwarded-For"]
+        if context.data["X-Forwarded-For"]
+        else "127.0.0.1"
+    )
 
     async with apply_custom_rate_limit(
         unique_key="turnstile_" + client_ip,