From 9b27d3aa4489a7fa5597a99d4010b5fb74a338c5 Mon Sep 17 00:00:00 2001 From: gustafhalldor Date: Mon, 25 Mar 2024 13:39:32 +0000 Subject: [PATCH 1/3] Renamed property --- src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs | 2 +- src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs | 2 +- src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs b/src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs index f87819c9..4c5ed45f 100644 --- a/src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs +++ b/src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs @@ -9,6 +9,6 @@ public interface IRateLimitProcessor Task> GetMatchingRulesAsync(ClientRequestIdentity identity, CancellationToken cancellationToken = default); RateLimitHeaders GetRateLimitHeaders(RateLimitCounter? counter, RateLimitRule rule, CancellationToken cancellationToken = default); Task ProcessRequestAsync(ClientRequestIdentity requestIdentity, RateLimitRule rule, CancellationToken cancellationToken = default); - bool IsWhitelisted(ClientRequestIdentity requestIdentity); + bool IsOnAllowedList(ClientRequestIdentity requestIdentity); } } \ No newline at end of file diff --git a/src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs b/src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs index bb3945b7..d8387e0f 100644 --- a/src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs +++ b/src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs @@ -16,7 +16,7 @@ protected RateLimitProcessor(RateLimitOptions options) } - public virtual bool IsWhitelisted(ClientRequestIdentity requestIdentity) + public virtual bool IsOnAllowedList(ClientRequestIdentity requestIdentity) { if (_options.ClientWhitelist != null && _options.ClientWhitelist.Contains(requestIdentity.ClientId)) { diff --git a/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs b/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs index 3b6f63fc..8df790d5 100644 --- a/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs +++ b/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs @@ -40,8 +40,8 @@ public async Task Invoke(HttpContext context) // compute identity from request var identity = await ResolveIdentityAsync(context); - // check white list - if (_processor.IsWhitelisted(identity)) + // check allowed list + if (_processor.IsOnAllowedList(identity)) { await _next.Invoke(context); return; From 50ec07e91bb0e27e046e9abb47ff1c187e1a3cda Mon Sep 17 00:00:00 2001 From: gustafhalldor Date: Mon, 25 Mar 2024 15:10:21 +0000 Subject: [PATCH 2/3] Created wrapper instead of renaming method directly --- src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs | 6 +++++- src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs | 2 +- src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs b/src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs index 4c5ed45f..9f271c36 100644 --- a/src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs +++ b/src/AspNetCoreRateLimit/Core/IRateLimitProcessor.cs @@ -9,6 +9,10 @@ public interface IRateLimitProcessor Task> GetMatchingRulesAsync(ClientRequestIdentity identity, CancellationToken cancellationToken = default); RateLimitHeaders GetRateLimitHeaders(RateLimitCounter? counter, RateLimitRule rule, CancellationToken cancellationToken = default); Task ProcessRequestAsync(ClientRequestIdentity requestIdentity, RateLimitRule rule, CancellationToken cancellationToken = default); - bool IsOnAllowedList(ClientRequestIdentity requestIdentity); + bool IsWhitelisted(ClientRequestIdentity requestIdentity); + bool IsOnAllowedList(ClientRequestIdentity requestIdentity) + { + return IsWhitelisted(requestIdentity); + } } } \ No newline at end of file diff --git a/src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs b/src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs index d8387e0f..bb3945b7 100644 --- a/src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs +++ b/src/AspNetCoreRateLimit/Core/RateLimitProcessor.cs @@ -16,7 +16,7 @@ protected RateLimitProcessor(RateLimitOptions options) } - public virtual bool IsOnAllowedList(ClientRequestIdentity requestIdentity) + public virtual bool IsWhitelisted(ClientRequestIdentity requestIdentity) { if (_options.ClientWhitelist != null && _options.ClientWhitelist.Contains(requestIdentity.ClientId)) { diff --git a/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs b/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs index 8df790d5..a308729b 100644 --- a/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs +++ b/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs @@ -41,7 +41,7 @@ public async Task Invoke(HttpContext context) var identity = await ResolveIdentityAsync(context); // check allowed list - if (_processor.IsOnAllowedList(identity)) + if (_processor.IsWhitelisted(identity)) { await _next.Invoke(context); return; From 24e53d6ffb10dd865d2a7fa383a6e90bd98493ab Mon Sep 17 00:00:00 2001 From: gustafhalldor Date: Mon, 25 Mar 2024 15:11:29 +0000 Subject: [PATCH 3/3] Reverting change to comment --- src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs b/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs index a308729b..3b6f63fc 100644 --- a/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs +++ b/src/AspNetCoreRateLimit/Middleware/RateLimitMiddleware.cs @@ -40,7 +40,7 @@ public async Task Invoke(HttpContext context) // compute identity from request var identity = await ResolveIdentityAsync(context); - // check allowed list + // check white list if (_processor.IsWhitelisted(identity)) { await _next.Invoke(context);