😊 新增获取客户端 IPv4 支持配置是否优先获取请求头携带的 X-Forwarded-For 值

MonkSoul · Jun 25, 2024 · c280dfd · c280dfd
1 parent 89ce2f1
commit c280dfd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/framework/Furion.Pure/AspNetCore/Extensions/HttpContextExtensions.cs b/framework/Furion.Pure/AspNetCore/Extensions/HttpContextExtensions.cs
@@ -116,10 +116,19 @@ public static string GetLocalIpAddressToIPv6(this HttpContext context)
     /// 获取远程 IPv4地址
     /// </summary>
     /// <param name="context"></param>
+    /// <param name="xff">是否优先取 X-Forwarded-For</param>
     /// <returns></returns>
-    public static string GetRemoteIpAddressToIPv4(this HttpContext context)
+    public static string GetRemoteIpAddressToIPv4(this HttpContext context, bool xff = false)
     {
-        return context.Connection.RemoteIpAddress?.MapToIPv4()?.ToString();
+        var ipv4 = context.Connection.RemoteIpAddress?.MapToIPv4()?.ToString();
+
+        if (xff)
+        {
+            var xForwardedFor = context.Request.Headers["X-Forwarded-For"];
+            return !string.IsNullOrWhiteSpace(xForwardedFor) ? xForwardedFor : ipv4;
+        }
+
+        return ipv4;
     }
 
     /// <summary>

diff --git a/framework/Furion/AspNetCore/Extensions/HttpContextExtensions.cs b/framework/Furion/AspNetCore/Extensions/HttpContextExtensions.cs
@@ -116,10 +116,19 @@ public static string GetLocalIpAddressToIPv6(this HttpContext context)
     /// 获取远程 IPv4地址
     /// </summary>
     /// <param name="context"></param>
+    /// <param name="xff">是否优先取 X-Forwarded-For</param>
     /// <returns></returns>
-    public static string GetRemoteIpAddressToIPv4(this HttpContext context)
+    public static string GetRemoteIpAddressToIPv4(this HttpContext context, bool xff = false)
     {
-        return context.Connection.RemoteIpAddress?.MapToIPv4()?.ToString();
+        var ipv4 = context.Connection.RemoteIpAddress?.MapToIPv4()?.ToString();
+
+        if (xff)
+        {
+            var xForwardedFor = context.Request.Headers["X-Forwarded-For"];
+            return !string.IsNullOrWhiteSpace(xForwardedFor) ? xForwardedFor : ipv4;
+        }
+
+        return ipv4;
     }
 
     /// <summary>