From b9c6660e082321a9965820aa6d72b29936b5c511 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Wed, 3 Aug 2022 22:58:07 +0200
Subject: [PATCH] shuffle things around

---
 .../MareSynchronosServer/Startup.cs           |  4 +-
 .../Throttling/SignalRLimitFilter.cs          | 58 -------------------
 2 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 MareSynchronosServer/MareSynchronosServer/Throttling/SignalRLimitFilter.cs

diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs
index 05dcbf0..5373084 100644
--- a/MareSynchronosServer/MareSynchronosServer/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs
@@ -69,7 +69,6 @@ namespace MareSynchronosServer
                 .AddScheme<AuthenticationSchemeOptions, SecretKeyAuthenticationHandler>(SecretKeyAuthenticationHandler.AuthScheme, options => { });
             services.AddAuthorization(options => options.FallbackPolicy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build());
 
-            services.AddSingleton<IRateLimitConfiguration, RateLimitConfiguration>();
 
             services.AddSignalR(hubOptions =>
             {
@@ -77,8 +76,9 @@ namespace MareSynchronosServer
                 hubOptions.EnableDetailedErrors = true;
                 hubOptions.MaximumParallelInvocationsPerClient = 10;
                 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.
diff --git a/MareSynchronosServer/MareSynchronosServer/Throttling/SignalRLimitFilter.cs b/MareSynchronosServer/MareSynchronosServer/Throttling/SignalRLimitFilter.cs
deleted file mode 100644
index ac0f161..0000000
--- a/MareSynchronosServer/MareSynchronosServer/Throttling/SignalRLimitFilter.cs
+++ /dev/null
@@ -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);
-    }
-}