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

add whitelisted ips to secret key auth handler

Browse Source
This commit is contained in:
Stanley Dimant
2022-10-02 16:57:31 +02:00
parent 8236d355a2
commit d866223069
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MareSynchronosServer/MareSynchronosServices/Authentication/SecretKeyAuthenticationHandler.cs
View File

@@ -25,6 +25,7 @@ public class SecretKeyAuthenticationHandler
private readonly object failedAuthLock = new(); private readonly object failedAuthLock = new();
private readonly int _failedAttemptsForTempBan; private readonly int _failedAttemptsForTempBan;
private readonly int _tempBanMinutes; private readonly int _tempBanMinutes;
private List<string> _whitelistedIps = new();
public void ClearUnauthorizedUsers() public void ClearUnauthorizedUsers()
{ {
@@ -136,14 +137,18 @@ public class SecretKeyAuthenticationHandler
logger.LogWarning("Failed authorization from {ip}", ip); logger.LogWarning("Failed authorization from {ip}", ip);
lock (failedAuthLock) lock (failedAuthLock)
{ {
if (failedAuthorizations.TryGetValue(ip, out var auth)) if (!_whitelistedIps.Any(w => ip.Contains(w)))
{ {
auth.IncreaseFailedAttempts(); if (failedAuthorizations.TryGetValue(ip, out var auth))
} {
else auth.IncreaseFailedAttempts();
{ }
failedAuthorizations[ip] = new FailedAuthorization(); else
{
failedAuthorizations[ip] = new FailedAuthorization();
}
} }
} }
metrics.IncCounter(MetricsAPI.CounterAuthenticationFailures); metrics.IncCounter(MetricsAPI.CounterAuthenticationFailures);
@@ -168,5 +173,6 @@ public class SecretKeyAuthenticationHandler
var config = configuration.GetRequiredSection("MareSynchronos"); var config = configuration.GetRequiredSection("MareSynchronos");
_failedAttemptsForTempBan = config.GetValue<int>("FailedAuthForTempBan", 5); _failedAttemptsForTempBan = config.GetValue<int>("FailedAuthForTempBan", 5);
_tempBanMinutes = config.GetValue<int>("TempBanDurationInMinutes", 30); _tempBanMinutes = config.GetValue<int>("TempBanDurationInMinutes", 30);
_whitelistedIps = config.GetValue<List<string>>("WhitelistedIps", new List<string>());
} }
} }