t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust extensions, again and again

Browse Source
This commit is contained in:
rootdarkarchon
2023-02-10 15:18:34 +01:00
parent 03d7549d29
commit 3490c5c8d8
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
MareSynchronosServer/MareSynchronosShared/Extensions.cs
View File

@@ -4,28 +4,36 @@ namespace MareSynchronosShared;
public static class Extensions public static class Extensions
{ {
private static long _noIpCntr = 0;
public static string GetIpAddress(this IHttpContextAccessor accessor) public static string GetIpAddress(this IHttpContextAccessor accessor)
{ {
if (!string.IsNullOrEmpty(accessor.HttpContext.Request.Headers["CF-CONNECTING-IP"])) try
return accessor.HttpContext.Request.Headers["CF-CONNECTING-IP"];
if (!string.IsNullOrEmpty(accessor.HttpContext.Request.Headers["X-Forwarded-For"]))
{ {
return accessor.HttpContext.Request.Headers["X-Forwarded-For"]; if (!string.IsNullOrEmpty(accessor.HttpContext.Request.Headers["CF-CONNECTING-IP"]))
} return accessor.HttpContext.Request.Headers["CF-CONNECTING-IP"];
var ipAddress = accessor.HttpContext.GetServerVariable("HTTP_X_FORWARDED_FOR"); if (!string.IsNullOrEmpty(accessor.HttpContext.Request.Headers["X-Forwarded-For"]))
if (!string.IsNullOrWhiteSpace(ipAddress))
{
var addresses = ipAddress.Split(',', StringSplitOptions.RemoveEmptyEntries);
var lastEntry = addresses.LastOrDefault();
if (lastEntry != null)
{ {
return lastEntry; return accessor.HttpContext.Request.Headers["X-Forwarded-For"];
} }
}
return accessor.HttpContext.Connection.RemoteIpAddress.ToString(); var ipAddress = accessor.HttpContext.GetServerVariable("HTTP_X_FORWARDED_FOR");
if (!string.IsNullOrWhiteSpace(ipAddress))
{
var addresses = ipAddress.Split(',', StringSplitOptions.RemoveEmptyEntries);
var lastEntry = addresses.LastOrDefault();
if (lastEntry != null)
{
return lastEntry;
}
}
return accessor.HttpContext.Connection.RemoteIpAddress?.ToString() ?? "NoIp";
}
catch
{
return "NoIp" + _noIpCntr++;
}
} }
} }