Fetch user IP with 'X-Forward-For' (#13575)

* Fetch user IP with 'X-Forward-For' * Run format-python
canonical · Feb 13, 2024 · 9c0a086 · 9c0a086
1 parent a9058fa
commit 9c0a086
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/webapp/views.py b/webapp/views.py
@@ -1072,9 +1072,13 @@ def thank_you():
 
 
 def get_user_country_by_ip():
-    client_ip = flask.request.headers.get(
-        "X-Real-IP", flask.request.remote_addr
-    )
+    x_forwarded_for = flask.request.headers.get("X-Forwarded-For")
+
+    if x_forwarded_for:
+        client_ip = x_forwarded_for.split(",")[0]
+    else:
+        client_ip = flask.request.remote_addr
+
     ip_location = ip_reader.get(client_ip)
 
     try: