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

add rate limiting for disconnects, logging exceptions and minor query optimizations for disconnects

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-15 02:22:02 +02:00
parent a33cf2b2d1
commit 697b4c39ca
2 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
View File

@@ -91,26 +91,29 @@ namespace MareSynchronosServer.Hubs
{ {
MareMetrics.Connections.Dec(); MareMetrics.Connections.Dec();
var user = await _dbContext.Users.AsNoTracking().SingleOrDefaultAsync(u => u.UID == AuthenticatedUserId); var user = await _dbContext.Users.SingleOrDefaultAsync(u => u.UID == AuthenticatedUserId);
if (user != null && !string.IsNullOrEmpty(user.CharacterIdentification)) if (user != null && !string.IsNullOrEmpty(user.CharacterIdentification))
{ {
MareMetrics.AuthorizedConnections.Dec(); MareMetrics.AuthorizedConnections.Dec();
_logger.LogInformation("Disconnect from " + AuthenticatedUserId); _logger.LogInformation("Disconnect from " + AuthenticatedUserId);
var otherUsers = await _dbContext.ClientPairs.AsNoTracking() var otherUsers = await _dbContext.ClientPairs.AsNoTracking()
.Include(u => u.User)
.Include(u => u.OtherUser) .Include(u => u.OtherUser)
.Where(w => w.User.UID == user.UID && !w.IsPaused) .Where(self => self.UserUID == user.UID && !self.IsPaused && self.OtherUser.CharacterIdentification != null)
.Where(w => !string.IsNullOrEmpty(w.OtherUser.CharacterIdentification)) .Select(e => e.OtherUserUID)
.Select(e => e.OtherUser).ToListAsync(); .ToListAsync();
var otherEntries = await _dbContext.ClientPairs.AsNoTracking().Include(u => u.User)
.Where(u => otherUsers.Any(e => e == u.User) && u.OtherUser.UID == user.UID && !u.IsPaused).ToListAsync();
await Clients.Users(otherEntries.Select(e => e.User.UID)).SendAsync(Api.OnUserRemoveOnlinePairedPlayer, user.CharacterIdentification);
var notUploadedFiles = _dbContext.Files.Where(f => !f.Uploaded && f.Uploader.UID == user.UID).ToList(); var otherEntries = await _dbContext.ClientPairs.AsNoTracking()
_dbContext.RemoveRange(notUploadedFiles); .Where(other => otherUsers.Contains(other.UserUID) && other.OtherUserUID == user.UID && !other.IsPaused)
.Select(u => u.UserUID)
.ToListAsync();
(await _dbContext.Users.SingleAsync(u => u.UID == AuthenticatedUserId)).CharacterIdentification = null; await Clients.Users(otherEntries).SendAsync(Api.OnUserRemoveOnlinePairedPlayer, user.CharacterIdentification);
_dbContext.RemoveRange(_dbContext.Files.Where(f => !f.Uploaded && f.Uploader.UID == user.UID));
user.CharacterIdentification = null;
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
} }

27
MareSynchronosServer/MareSynchronosServer/Throttling/SignalRLimitFilter.cs
View File

@@ -15,7 +15,8 @@ public class SignalRLimitFilter : IHubFilter
private readonly IRateLimitProcessor _processor; private readonly IRateLimitProcessor _processor;
private readonly IHttpContextAccessor accessor; private readonly IHttpContextAccessor accessor;
private readonly ILogger<SignalRLimitFilter> logger; private readonly ILogger<SignalRLimitFilter> logger;
private static SemaphoreSlim ConnectionLimiterSemaphore = new SemaphoreSlim(20); private static SemaphoreSlim ConnectionLimiterSemaphore = new(20);
private static SemaphoreSlim DisconnectLimiterSemaphore = new(20);
public SignalRLimitFilter( public SignalRLimitFilter(
IOptions<IpRateLimitOptions> options, IProcessingStrategy processing, IIpPolicyStore policyStore, IHttpContextAccessor accessor, ILogger<SignalRLimitFilter> logger) IOptions<IpRateLimitOptions> options, IProcessingStrategy processing, IIpPolicyStore policyStore, IHttpContextAccessor accessor, ILogger<SignalRLimitFilter> logger)
@@ -76,20 +77,34 @@ public class SignalRLimitFilter : IHubFilter
try try
{ {
await Task.Delay(100); await Task.Delay(250);
await next(context); await next(context);
} }
catch { } catch (Exception ex)
{
logger.LogWarning(ex, "Error on OnConnectedAsync");
}
finally finally
{ {
ConnectionLimiterSemaphore.Release(); ConnectionLimiterSemaphore.Release();
} }
} }
// Optional method public async Task OnDisconnectedAsync(
public Task OnDisconnectedAsync(
HubLifetimeContext context, Exception exception, Func<HubLifetimeContext, Exception, Task> next) HubLifetimeContext context, Exception exception, Func<HubLifetimeContext, Exception, Task> next)
{ {
return next(context, exception); await DisconnectLimiterSemaphore.WaitAsync();
try
{
await next(context, exception);
}
catch
{
logger.LogWarning(exception, "Error on OnDisconnectedAsync");
}
finally
{
DisconnectLimiterSemaphore.Release();
}
} }
} }