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

adjust handling of auth handler

Browse Source
This commit is contained in:
rootdarkarchon
2022-11-07 02:28:14 +01:00
parent 2a1b04214b
commit b7611a58da
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,12 +2,11 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using MareSynchronosShared.Data; using MareSynchronosShared.Data;
using MareSynchronosShared.Metrics; using MareSynchronosShared.Metrics;
using MareSynchronosShared.Protos; using MareSynchronosShared.Protos;
using MareSynchronosShared.Utils;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@@ -31,7 +30,7 @@ public class SecretKeyAuthenticationHandler
{ {
if (item.Value == Unauthorized) if (item.Value == Unauthorized)
{ {
_cachedAuthorizations[item.Key] = string.Empty; _cachedAuthorizations.TryRemove(item.Key, out _);
} }
} }
} }
@@ -76,12 +75,11 @@ public class SecretKeyAuthenticationHandler
return new AuthReply() { Success = false, Uid = new UidMessage() { Uid = string.Empty } }; return new AuthReply() { Success = false, Uid = new UidMessage() { Uid = string.Empty } };
} }
using var sha256 = SHA256.Create(); var hashedHeader = StringUtils.Sha256String(secretKey);
var hashedHeader = BitConverter.ToString(sha256.ComputeHash(Encoding.UTF8.GetBytes(secretKey))).Replace("-", "");
bool fromCache = _cachedAuthorizations.TryGetValue(hashedHeader, out string uid); bool fromCache = _cachedAuthorizations.TryGetValue(hashedHeader, out string uid);
if (fromCache) if (fromCache && !string.IsNullOrEmpty(uid))
{ {
_metrics.IncCounter(MetricsAPI.CounterAuthenticationCacheHits); _metrics.IncCounter(MetricsAPI.CounterAuthenticationCacheHits);
@@ -95,7 +93,7 @@ public class SecretKeyAuthenticationHandler
uid = (await mareDbContext.Auth.AsNoTracking() uid = (await mareDbContext.Auth.AsNoTracking()
.FirstOrDefaultAsync(m => m.HashedKey == hashedHeader).ConfigureAwait(false))?.UserUID; .FirstOrDefaultAsync(m => m.HashedKey == hashedHeader).ConfigureAwait(false))?.UserUID;
if (uid == null) if (string.IsNullOrEmpty(uid))
{ {
_cachedAuthorizations[hashedHeader] = Unauthorized; _cachedAuthorizations[hashedHeader] = Unauthorized;
@@ -132,8 +130,8 @@ public class SecretKeyAuthenticationHandler
public SecretKeyAuthenticationHandler(IConfiguration configuration, ILogger<SecretKeyAuthenticationHandler> logger, MareMetrics metrics) public SecretKeyAuthenticationHandler(IConfiguration configuration, ILogger<SecretKeyAuthenticationHandler> logger, MareMetrics metrics)
{ {
this._logger = logger; _logger = logger;
this._metrics = metrics; _metrics = metrics;
var config = configuration.GetRequiredSection("MareSynchronos"); var config = configuration.GetRequiredSection("MareSynchronos");
_failedAttemptsForTempBan = config.GetValue<int>("FailedAuthForTempBan", 5); _failedAttemptsForTempBan = config.GetValue<int>("FailedAuthForTempBan", 5);
logger.LogInformation("FailedAuthForTempBan: {num}", _failedAttemptsForTempBan); logger.LogInformation("FailedAuthForTempBan: {num}", _failedAttemptsForTempBan);