friendlynamazu/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix existinguserrequirementhandler

Browse Source
This commit is contained in:
rootdarkarchon
2025-07-16 03:27:07 +02:00
parent 1094445d40
commit a4c760af25
1 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ExistingUserRequirementHandler.cs
View File

@@ -3,12 +3,15 @@ using MareSynchronosShared.Utils;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Collections.Concurrent;
namespace MareSynchronosShared.RequirementHandlers; namespace MareSynchronosShared.RequirementHandlers;
public class ExistingUserRequirementHandler : AuthorizationHandler<ExistingUserRequirement> public class ExistingUserRequirementHandler : AuthorizationHandler<ExistingUserRequirement>
{ {
private readonly IDbContextFactory<MareDbContext> _dbContextFactory; private readonly IDbContextFactory<MareDbContext> _dbContextFactory;
private readonly ILogger<ExistingUserRequirementHandler> _logger; private readonly ILogger<ExistingUserRequirementHandler> _logger;
private readonly static ConcurrentDictionary<string, (bool Exists, DateTime LastCheck)> _existingUserDict = [];
private readonly static ConcurrentDictionary<ulong, (bool Exists, DateTime LastCheck)> _existingDiscordDict = [];
public ExistingUserRequirementHandler(IDbContextFactory<MareDbContext> dbContext, ILogger<ExistingUserRequirementHandler> logger) public ExistingUserRequirementHandler(IDbContextFactory<MareDbContext> dbContext, ILogger<ExistingUserRequirementHandler> logger)
{ {
@@ -18,21 +21,59 @@ public class ExistingUserRequirementHandler : AuthorizationHandler<ExistingUserR
protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, ExistingUserRequirement requirement) protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, ExistingUserRequirement requirement)
{ {
var uid = context.User.Claims.SingleOrDefault(g => string.Equals(g.Type, MareClaimTypes.Uid, StringComparison.Ordinal))?.Value; try
if (uid == null) context.Fail(); {
var uid = context.User.Claims.SingleOrDefault(g => string.Equals(g.Type, MareClaimTypes.Uid, StringComparison.Ordinal))?.Value;
if (uid == null)
{
context.Fail();
return;
}
var discordIdString = context.User.Claims.SingleOrDefault(g => string.Equals(g.Type, MareClaimTypes.DiscordId, StringComparison.Ordinal))?.Value; var discordIdString = context.User.Claims.SingleOrDefault(g => string.Equals(g.Type, MareClaimTypes.DiscordId, StringComparison.Ordinal))?.Value;
if (discordIdString == null) context.Fail(); if (discordIdString == null)
{
context.Fail();
return;
}
if (!ulong.TryParse(discordIdString, out ulong discordId))
{
context.Fail();
return;
}
using var dbContext = await _dbContextFactory.CreateDbContextAsync().ConfigureAwait(false); using var dbContext = await _dbContextFactory.CreateDbContextAsync().ConfigureAwait(false);
var user = await dbContext.Users.AsNoTracking().SingleOrDefaultAsync(b => b.UID == uid).ConfigureAwait(false);
if (user == null) context.Fail();
if (!ulong.TryParse(discordIdString, out ulong discordId)) context.Fail(); if (!_existingUserDict.TryGetValue(uid, out (bool Exists, DateTime LastCheck) existingUser)
|| DateTime.UtcNow.Subtract(existingUser.LastCheck).TotalHours > 1)
{
var userExists = await dbContext.Users.SingleOrDefaultAsync(context => context.UID == uid).ConfigureAwait(false) != null;
_existingUserDict[uid] = existingUser = (userExists, DateTime.UtcNow);
}
if (!existingUser.Exists)
{
context.Fail();
return;
}
var discordUser = await dbContext.LodeStoneAuth.AsNoTracking().SingleOrDefaultAsync(b => b.DiscordId == discordId).ConfigureAwait(false); if (!_existingDiscordDict.TryGetValue(discordId, out (bool Exists, DateTime LastCheck) existingDiscordUser)
if (discordUser == null) context.Fail(); || DateTime.UtcNow.Subtract(existingDiscordUser.LastCheck).TotalHours > 1)
{
var discordUserExists = await dbContext.LodeStoneAuth.AsNoTracking().SingleOrDefaultAsync(b => b.DiscordId == discordId).ConfigureAwait(false) != null;
_existingDiscordDict[discordId] = existingDiscordUser = (discordUserExists, DateTime.UtcNow);
}
context.Succeed(requirement); if (!existingDiscordUser.Exists)
{
context.Fail();
return;
}
context.Succeed(requirement);
}
catch (Exception e)
{
_logger.LogWarning(e, "ExistingUserRequirementHandler failed");
}
} }
} }