Lightless-Sync/LightlessServer
8
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Added IP check on loopback

Browse Source
This commit is contained in:
CakeAndBanana
2025-10-20 03:27:47 +02:00
parent 23ee3f98b0
commit 8a329ccbaa
4 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LightlessSyncServer/LightlessSyncAuthService/Controllers/JwtController.cs
View File

@@ -1,5 +1,6 @@
using LightlessSync.API.Routes;
using LightlessSyncAuthService.Services;
using LightlessSyncAuthService.Utils;
using LightlessSyncShared;
using LightlessSyncShared.Data;
using LightlessSyncShared.Services;

1
LightlessSyncServer/LightlessSyncAuthService/Controllers/OAuthController.cs
View File

@@ -1,5 +1,6 @@
using LightlessSync.API.Routes;
using LightlessSyncAuthService.Services;
using LightlessSyncAuthService.Utils;
using LightlessSyncShared;
using LightlessSyncShared.Data;
using LightlessSyncShared.Services;

34
LightlessSyncServer/LightlessSyncAuthService/Services/GeoIPService.cs
View File

@@ -1,9 +1,11 @@
using LightlessSyncShared;
using LightlessSyncAuthService.Utils;
using LightlessSyncShared;
using LightlessSyncShared.Services;
using LightlessSyncShared.Utils.Configuration;
using MaxMind.GeoIP2;
using MaxMind.GeoIP2.Model;
using Microsoft.AspNetCore.Http;
using System.Net;
using System.Security.Claims;
namespace LightlessSyncAuthService.Services;
@@ -35,7 +37,9 @@ public class GeoIPService : IHostedService
try
{
var ip = httpContextAccessor.GetIpAddress();
var ip = httpContextAccessor.GetClientIpAddress();
if (ip is null || IPAddress.IsLoopback(ip))
return "*";
using CancellationTokenSource waitCts = new();
waitCts.CancelAfter(TimeSpan.FromSeconds(5));
@@ -148,33 +152,29 @@ public class GeoIPService : IHostedService
internal async Task<string> GetCountryFromIP(IHttpContextAccessor httpContextAccessor)
{
if (!_useGeoIP)
{
return "*";
}
var ip = httpContextAccessor.GetClientIpAddress();
if (ip is null || IPAddress.IsLoopback(ip))
return "*";
try
{
var ip = httpContextAccessor.GetIpAddress();
using CancellationTokenSource waitCts = new();
waitCts.CancelAfter(TimeSpan.FromSeconds(5));
while (_processingReload) await Task.Delay(100, waitCts.Token).ConfigureAwait(false);
using CancellationTokenSource waitCts = new(TimeSpan.FromSeconds(5));
while (_processingReload)
await Task.Delay(100, waitCts.Token).ConfigureAwait(false);
if (_dbReader!.TryCity(ip, out var response))
{
string? country = response?.Country.IsoCode;
if (!string.IsNullOrEmpty(country)
&& response?.Location.Longitude != null)
{
return country;
}
var country = response?.Country?.IsoCode;
return !string.IsNullOrEmpty(country) ? country : "*";
}
return "*";
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Error handling Geo IP country in request");
_logger.LogError(ex, "GeoIP lookup failed for {Ip}", ip);
return "*";
}
}

26
LightlessSyncServer/LightlessSyncAuthService/Utils/HttpContextAccessorExtensions.cs Normal file
View File

@@ -0,0 +1,26 @@
using System.Net;
namespace LightlessSyncAuthService.Utils
{
public static class HttpContextAccessorExtensions
{
public static IPAddress? GetClientIpAddress(this IHttpContextAccessor accessor)
{
var context = accessor.HttpContext;
if (context == null) return null;
string[] headerKeys = { "CF-Connecting-IP", "X-Forwarded-For", "X-Real-IP" };
foreach (var key in headerKeys)
{
if (context.Request.Headers.TryGetValue(key, out var values))
{
var ipCandidate = values.FirstOrDefault()?.Split(',').FirstOrDefault()?.Trim();
if (IPAddress.TryParse(ipCandidate, out var parsed))
return parsed;
}
}
return context.Connection?.RemoteIpAddress;
}
}
}