Merge branch 'Testing' into CN-Special

NikoCat233 · Apr 21, 2024 · ba47248 · ba47248
2 parents 3b57b21 + 68e62b8
commit ba47248
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Impostor.Server/Http/TokenController.cs b/src/Impostor.Server/Http/TokenController.cs
@@ -34,7 +34,16 @@ public IActionResult GetToken([FromBody] TokenRequest request)
 
         if (Request.Headers.TryGetValue("X-Forwarded-For", out var forwardedIps))
         {
-            ipAddress = forwardedIps.First();
+            var forwardedIp = forwardedIps.First()!.Split(',').Select(ip => ip.Trim()).FirstOrDefault();
+            if (!string.IsNullOrEmpty(forwardedIp))
+            {
+                ipAddress = forwardedIp;
+            }
+        }
+
+        if (string.IsNullOrEmpty(ipAddress))
+        {
+            ipAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString();
         }
 
         if (string.IsNullOrEmpty(ipAddress))