Upgrdae django-basic-auth-ip-whitelist to 0.6.0

Author: nickmoreton

poetry.lock

@@ -12,7 +12,7 @@ psycopg2 = "~2.9"
 gunicorn = {version = "~23.0", optional = true}
 
 # Django packages
-django-basic-auth-ip-whitelist = "~0.5"
+django-basic-auth-ip-whitelist = "~0.6"
 django-birdbath = "^2.0.1"
 django-cors-headers = "^4.6.0"
 django-countries = "^7.6.1"
@@ -48,6 +48,7 @@ tblib = "^3.0.0"
 urllib3 = "^2.3.0"
 whitenoise = "^6.8.2"
 social-auth-app-django = "^5.4.2"
+django-xff = "^1.4.0"
 
 [tool.poetry.extras]
 gunicorn = ["gunicorn"]

pyproject.toml

@@ -125,6 +125,7 @@
     # SecurityMiddleware.
     # http://whitenoise.evans.io/en/stable/#quickstart-for-django-apps
     "whitenoise.middleware.WhiteNoiseMiddleware",
+    "xff.middleware.XForwardedForMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
@@ -394,6 +395,7 @@
             "level": "WARNING",
             "propagate": False,
         },
+        "xff": {"handlers": ["console"], "level": "WARNING", "propagate": False},
     },
 }
 
@@ -667,6 +669,10 @@
     BASIC_AUTH_GET_CLIENT_IP_FUNCTION = "rca.utils.clientip.get_client_real_ip"
     BASIC_AUTH_WHITELISTED_PATHS = ["/api"]
 
+# django-xff (https://github.com/ferrix/xff/?tab=readme-ov-file#configuration)
+# --------------------------------------------------------------------------------------
+XFF_TRUSTED_PROXY_DEPTH = int(env.get("XFF_TRUSTED_PROXY_DEPTH", 1))
+
 AUTH_USER_MODEL = "users.User"
 
 # Wagtail settings