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

shuffle things around

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-03 22:58:07 +02:00
parent f7fa128efa
commit b9c6660e08
2 changed files with 2 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MareSynchronosServer/MareSynchronosServer/Startup.cs
View File

@@ -69,7 +69,6 @@ namespace MareSynchronosServer
.AddScheme<AuthenticationSchemeOptions, SecretKeyAuthenticationHandler>(SecretKeyAuthenticationHandler.AuthScheme, options => { }); .AddScheme<AuthenticationSchemeOptions, SecretKeyAuthenticationHandler>(SecretKeyAuthenticationHandler.AuthScheme, options => { });
services.AddAuthorization(options => options.FallbackPolicy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build()); services.AddAuthorization(options => options.FallbackPolicy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build());
services.AddSingleton<IRateLimitConfiguration, RateLimitConfiguration>();
services.AddSignalR(hubOptions => services.AddSignalR(hubOptions =>
{ {
@@ -77,8 +76,9 @@ namespace MareSynchronosServer
hubOptions.EnableDetailedErrors = true; hubOptions.EnableDetailedErrors = true;
hubOptions.MaximumParallelInvocationsPerClient = 10; hubOptions.MaximumParallelInvocationsPerClient = 10;
hubOptions.StreamBufferCapacity = 200; hubOptions.StreamBufferCapacity = 200;
hubOptions.AddFilter<SignalRLimitFilter>();
}); });
services.AddSingleton<IRateLimitConfiguration, RateLimitConfiguration>();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

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

@@ -1,58 +0,0 @@
using AspNetCoreRateLimit;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Options;
using System;
using System.Threading.Tasks;
namespace MareSynchronosServer.Throttling;
public class SignalRLimitFilter : IHubFilter
{
private readonly IRateLimitProcessor _processor;
public SignalRLimitFilter(
IOptions<IpRateLimitOptions> options, IProcessingStrategy processing, IRateLimitCounterStore counterStore,
IRateLimitConfiguration rateLimitConfiguration, IIpPolicyStore policyStore)
{
_processor = new IpRateLimitProcessor(options?.Value, policyStore, processing);
}
public async ValueTask<object> InvokeMethodAsync(
HubInvocationContext invocationContext, Func<HubInvocationContext, ValueTask<object>> next)
{
var httpContext = invocationContext.Context.GetHttpContext();
var ip = httpContext.Connection.RemoteIpAddress.ToString();
var client = new ClientRequestIdentity
{
ClientIp = ip,
Path = invocationContext.HubMethodName,
HttpVerb = "ws",
ClientId = invocationContext.Context.UserIdentifier
};
foreach (var rule in await _processor.GetMatchingRulesAsync(client))
{
var counter = await _processor.ProcessRequestAsync(client, rule);
Console.WriteLine("time: {0}, count: {1}", counter.Timestamp, counter.Count);
if (counter.Count > rule.Limit)
{
var retry = counter.Timestamp.RetryAfterFrom(rule);
throw new HubException($"call limit {retry}");
}
}
Console.WriteLine($"Calling hub method '{invocationContext.HubMethodName}'");
return await next(invocationContext);
}
// Optional method
public Task OnConnectedAsync(HubLifetimeContext context, Func<HubLifetimeContext, Task> next)
{
return next(context);
}
// Optional method
public Task OnDisconnectedAsync(
HubLifetimeContext context, Exception exception, Func<HubLifetimeContext, Exception, Task> next)
{
return next(context, exception);
}
}