From f0974c550bf5a3db21fa3d7678447faac9589a9f Mon Sep 17 00:00:00 2001 From: Fiyaz Bin Hasan Date: Wed, 12 Oct 2022 19:13:21 +0600 Subject: [PATCH 1/3] work --- .../Controllers/Home2Controller.cs | 33 -- .../Controllers/HomeController.cs | 32 ++ .../Data/ApplicationDbContext.cs | 13 +- .../WebRateLimitAuth/Models/ErrorViewModel.cs | 13 +- .../Models/MyRateLimitOptions.cs | 19 +- .../Pages/Shared/_Layout.cshtml | 4 +- .../rate-limit/WebRateLimitAuth/Program.cs | 452 +++++++++--------- .../SampleRateLimiterPolicy.cs | 16 +- .../Views/{Home2 => Home}/Index.cshtml | 2 +- .../Views/{Home2 => Home}/Privacy.cshtml | 0 .../appsettings.Development.json | 18 +- .../WebRateLimitAuth/appsettings.json | 18 +- 12 files changed, 298 insertions(+), 322 deletions(-) delete mode 100644 fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/Home2Controller.cs create mode 100644 fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/HomeController.cs rename fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/{Home2 => Home}/Index.cshtml (67%) rename fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/{Home2 => Home}/Privacy.cshtml (100%) diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/Home2Controller.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/Home2Controller.cs deleted file mode 100644 index d749e4d4..00000000 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/Home2Controller.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using System.Diagnostics; -using WebRateLimitAuth.Models; - -namespace WebRateLimitAuth.Controllers -{ - public class Home2Controller : Controller - { - private readonly ILogger _logger; - - public Home2Controller(ILogger logger) - { - _logger = logger; - } - - public IActionResult Index() - { - return View(); - } - - public async Task Privacy() - { - await Task.Delay(100); - return View(); - } - - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] - public IActionResult Error() - { - return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); - } - } -} diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/HomeController.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/HomeController.cs new file mode 100644 index 00000000..5b0010dc --- /dev/null +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/HomeController.cs @@ -0,0 +1,32 @@ +using Microsoft.AspNetCore.Mvc; +using System.Diagnostics; +using WebRateLimitAuth.Models; + +namespace WebRateLimitAuth.Controllers; + +public class HomeController : Controller +{ + private readonly ILogger _logger; + + public HomeController(ILogger logger) + { + _logger = logger; + } + + public IActionResult Index() + { + return View(); + } + + public async Task Privacy() + { + await Task.Delay(100); + return View(); + } + + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] + public IActionResult Error() + { + return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); + } +} diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Data/ApplicationDbContext.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Data/ApplicationDbContext.cs index 5b16ab6c..a2af1e21 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Data/ApplicationDbContext.cs +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Data/ApplicationDbContext.cs @@ -1,13 +1,12 @@ using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -namespace WebRateLimitAuth.Data +namespace WebRateLimitAuth.Data; + +public class ApplicationDbContext : IdentityDbContext { - public class ApplicationDbContext : IdentityDbContext + public ApplicationDbContext(DbContextOptions options) + : base(options) { - public ApplicationDbContext(DbContextOptions options) - : base(options) - { - } } -} \ No newline at end of file +} diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Models/ErrorViewModel.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Models/ErrorViewModel.cs index 3b1d0520..8f481af7 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Models/ErrorViewModel.cs +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Models/ErrorViewModel.cs @@ -1,9 +1,8 @@ -namespace WebRateLimitAuth.Models +namespace WebRateLimitAuth.Models; + +public class ErrorViewModel { - public class ErrorViewModel - { - public string? RequestId { get; set; } + public string? RequestId { get; set; } - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - } -} \ No newline at end of file + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); +} diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Models/MyRateLimitOptions.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Models/MyRateLimitOptions.cs index 5d87e469..b173911d 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Models/MyRateLimitOptions.cs +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Models/MyRateLimitOptions.cs @@ -3,14 +3,13 @@ namespace WebRateLimitAuth.Models; public class MyRateLimitOptions { public const string MyRateLimit = "MyRateLimit"; - - public int permitLimit { get; set; } = 100; - public int window { get; set; } = 10; - public int replenishmentPeriod { get; set; } = 2; - public int queueLimit { get; set; } = 100; - public int segmentsPerWindow { get; set; } = 8; - public int tokenLimit { get; set; } = 10; - public int tokenLimit2 { get; set; } = 20; - public int tokensPerPeriod { get; set; } = 4; - public bool autoReplenishment { get; set; } = false; + public int PermitLimit { get; set; } = 100; + public int Window { get; set; } = 10; + public int ReplenishmentPeriod { get; set; } = 2; + public int QueueLimit { get; set; } = 100; + public int SegmentsPerWindow { get; set; } = 8; + public int TokenLimit { get; set; } = 10; + public int TokenLimit2 { get; set; } = 20; + public int TokensPerPeriod { get; set; } = 4; + public bool AutoReplenishment { get; set; } = false; } diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Pages/Shared/_Layout.cshtml b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Pages/Shared/_Layout.cshtml index c476ede1..11e86e51 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Pages/Shared/_Layout.cshtml +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Pages/Shared/_Layout.cshtml @@ -26,10 +26,10 @@ RP Privacy
  • - MVC Home + MVC Home
  • - MVC Privacy + MVC Privacy
  • /b diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Program.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Program.cs index a2b4ff3f..30518395 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Program.cs +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Program.cs @@ -6,20 +6,20 @@ using System.Threading.RateLimiting; var builder = WebApplication.CreateBuilder(args); + +builder.Services.AddRateLimiter(_ => _ + .AddFixedWindowLimiter(policyName: "fixed", options => + { + options.PermitLimit = 4; + options.Window = TimeSpan.FromSeconds(12); + options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; + options.QueueLimit = 2; + })); + var app = builder.Build(); static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); -app.UseRateLimiter(new RateLimiterOptions() - .AddFixedWindowLimiter(policyName: "fixed", - options => - { - options.PermitLimit = 4; - options.Window = TimeSpan.FromSeconds(12); - options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; - options.QueueLimit = 2; - })); - app.MapGet("/", () => Results.Ok($"Hello {GetTicks()}")) .RequireRateLimiting("fixed"); @@ -34,23 +34,23 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.Configure( builder.Configuration.GetSection(MyRateLimitOptions.MyRateLimit)); -var app = builder.Build(); - -static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); var myOptions = new MyRateLimitOptions(); -app.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); +builder.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); var fixedPolicy = "fixed"; -app.UseRateLimiter(new RateLimiterOptions() - .AddFixedWindowLimiter(policyName: fixedPolicy, - options => - { - options.PermitLimit = myOptions.permitLimit; - options.Window = TimeSpan.FromSeconds(myOptions.window); - options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; - options.QueueLimit = myOptions.queueLimit; - })); +builder.Services.AddRateLimiter(_ => _ + .AddFixedWindowLimiter(policyName: fixedPolicy, options => + { + options.PermitLimit = myOptions.PermitLimit; + options.Window = TimeSpan.FromSeconds(myOptions.Window); + options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; + options.QueueLimit = myOptions.QueueLimit; + })); + +var app = builder.Build(); + +static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); app.MapGet("/", () => Results.Ok($"Hello {GetTicks()}")) .RequireRateLimiting(fixedPolicy); @@ -64,24 +64,24 @@ using WebRateLimitAuth.Models; var builder = WebApplication.CreateBuilder(args); -var app = builder.Build(); - -static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); var myOptions = new MyRateLimitOptions(); -app.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); +builder.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); var slidingPolicy = "sliding"; -app.UseRateLimiter(new RateLimiterOptions() - .AddSlidingWindowLimiter(policyName: slidingPolicy, - options => - { - options.PermitLimit = myOptions.permitLimit; - options.Window = TimeSpan.FromSeconds(myOptions.window); - options.SegmentsPerWindow = myOptions.segmentsPerWindow; - options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; - options.QueueLimit = myOptions.queueLimit; - })); +builder.Services.AddRateLimiter(_ => _ + .AddSlidingWindowLimiter(policyName: slidingPolicy, options => + { + options.PermitLimit = myOptions.PermitLimit; + options.Window = TimeSpan.FromSeconds(myOptions.Window); + options.SegmentsPerWindow = myOptions.SegmentsPerWindow; + options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; + options.QueueLimit = myOptions.QueueLimit; + })); + +var app = builder.Build(); + +static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); app.MapGet("/", () => Results.Ok($"Hello {GetTicks()}")) .RequireRateLimiting(slidingPolicy); @@ -89,29 +89,29 @@ app.Run(); // #elif CONCUR -// Quicktest 10 users, 9 seconds -> 982 requests, 900 errors +// Quick test 10 users, 9 seconds -> 982 requests, 900 errors // using Microsoft.AspNetCore.RateLimiting; using System.Threading.RateLimiting; using WebRateLimitAuth.Models; var builder = WebApplication.CreateBuilder(args); -var app = builder.Build(); - -static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); var concurrencyPolicy = "Concurrency"; var myOptions = new MyRateLimitOptions(); -app.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); +builder.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); -app.UseRateLimiter(new RateLimiterOptions() - .AddConcurrencyLimiter(policyName: concurrencyPolicy, - options => - { - options.PermitLimit = myOptions.permitLimit; - options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; - options.QueueLimit = myOptions.queueLimit; - })); +builder.Services.AddRateLimiter(_ => _ + .AddConcurrencyLimiter(policyName: concurrencyPolicy, options => + { + options.PermitLimit = myOptions.PermitLimit; + options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; + options.QueueLimit = myOptions.QueueLimit; + })); + +var app = builder.Build(); + +static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); app.MapGet("/", async () => { @@ -123,32 +123,32 @@ app.Run(); // #elif TOKEN -// Quicktest 20 users, 20 seconds -> 8965 requests 2,250 errors +// Quick test 20 users, 20 seconds -> 8965 requests 2,250 errors // using Microsoft.AspNetCore.RateLimiting; using System.Threading.RateLimiting; using WebRateLimitAuth.Models; var builder = WebApplication.CreateBuilder(args); -var app = builder.Build(); - -static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); var tokenPolicy = "token"; var myOptions = new MyRateLimitOptions(); -app.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); +builder.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); -app.UseRateLimiter(new RateLimiterOptions() - .AddTokenBucketLimiter(policyName: tokenPolicy, - options => - { - options.TokenLimit = myOptions.tokenLimit; - options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; - options.QueueLimit = myOptions.queueLimit; - options.ReplenishmentPeriod = TimeSpan.FromSeconds(myOptions.replenishmentPeriod); - options.TokensPerPeriod = myOptions.tokensPerPeriod; - options.AutoReplenishment = myOptions.autoReplenishment; - })); +builder.Services.AddRateLimiter(_ => _ + .AddTokenBucketLimiter(policyName: tokenPolicy, options => + { + options.TokenLimit = myOptions.TokenLimit; + options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; + options.QueueLimit = myOptions.QueueLimit; + options.ReplenishmentPeriod = TimeSpan.FromSeconds(myOptions.ReplenishmentPeriod); + options.TokensPerPeriod = myOptions.TokensPerPeriod; + options.AutoReplenishment = myOptions.AutoReplenishment; + })); + +var app = builder.Build(); + +static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); app.MapGet("/", () => Results.Ok($"Token Limiter {GetTicks()}")) .RequireRateLimiting(tokenPolicy); @@ -161,7 +161,6 @@ using System.Net; using System.Threading.RateLimiting; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.RateLimiting; using Microsoft.EntityFrameworkCore; using WebRateLimitAuth; using WebRateLimitAuth.Data; @@ -184,106 +183,101 @@ builder.Services.AddRazorPages(); builder.Services.AddControllersWithViews(); -var app = builder.Build(); - -if (app.Environment.IsDevelopment()) -{ - app.UseMigrationsEndPoint(); -} -else -{ - app.UseExceptionHandler("/Error"); - app.UseHsts(); -} - -app.UseHttpsRedirection(); -app.UseStaticFiles(); - -app.UseRouting(); - -// -// Preceding code removed for brevity. - -app.UseAuthentication(); -app.UseAuthorization(); - var userPolicyName = "user"; var helloPolicy = "hello"; var myOptions = new MyRateLimitOptions(); -var myConfigSection = app.Configuration.GetSection(MyRateLimitOptions.MyRateLimit); -myConfigSection.Bind(myOptions); +builder.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); -var options = new RateLimiterOptions() +builder.Services.AddRateLimiter(limiterOptions => { - OnRejected = (context, cancellationToken) => + limiterOptions.OnRejected = (context, cancellationToken) => { if (context.Lease.TryGetMetadata(MetadataName.RetryAfter, out var retryAfter)) { context.HttpContext.Response.Headers.RetryAfter = - ((int)retryAfter.TotalSeconds).ToString(NumberFormatInfo.InvariantInfo); + ((int) retryAfter.TotalSeconds).ToString(NumberFormatInfo.InvariantInfo); } context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests; - context?.HttpContext?.RequestServices?.GetService()? - .CreateLogger("Microsoft.AspNetCore.RateLimitingMiddleware") - .LogWarning($"OnRejected: {GetUserEndPoint(context.HttpContext)}"); + context.HttpContext.RequestServices.GetService()? + .CreateLogger("Microsoft.AspNetCore.RateLimitingMiddleware") + .LogWarning("OnRejected: {GetUserEndPoint}", GetUserEndPoint(context.HttpContext)); return new ValueTask(); - } -} - .AddPolicy(helloPolicy) - .AddPolicy(userPolicyName, context => + }; + + limiterOptions.AddPolicy(helloPolicy); + limiterOptions.AddPolicy(userPolicyName, context => { var username = "anonymous user"; - if (context.User?.Identity?.IsAuthenticated is true) + if (context.User.Identity?.IsAuthenticated is true) { - username = context.User?.ToString()!; + username = context.User.ToString()!; } - return RateLimitPartition.GetSlidingWindowLimiter(username, - key => new SlidingWindowRateLimiterOptions - { - PermitLimit = myOptions.permitLimit, - QueueProcessingOrder = QueueProcessingOrder.OldestFirst, - QueueLimit = myOptions.queueLimit, - Window = TimeSpan.FromSeconds(myOptions.window), - SegmentsPerWindow = myOptions.segmentsPerWindow - }); + return RateLimitPartition.GetSlidingWindowLimiter(username, + _ => new SlidingWindowRateLimiterOptions + { + PermitLimit = myOptions.PermitLimit, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = myOptions.QueueLimit, + Window = TimeSpan.FromSeconds(myOptions.Window), + SegmentsPerWindow = myOptions.SegmentsPerWindow + }); }); + + limiterOptions.GlobalLimiter = PartitionedRateLimiter.Create(context => + { + IPAddress? remoteIpAddress = context.Connection.RemoteIpAddress; -options.GlobalLimiter = PartitionedRateLimiter.Create(context => -{ - IPAddress? remoteIPaddress = context?.Connection?.RemoteIpAddress; + if (!IPAddress.IsLoopback(remoteIpAddress!)) + { + return RateLimitPartition.GetTokenBucketLimiter + (remoteIpAddress!, _ => + new TokenBucketRateLimiterOptions + { + TokenLimit = myOptions.TokenLimit2, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = myOptions.QueueLimit, + ReplenishmentPeriod = TimeSpan.FromSeconds(myOptions.ReplenishmentPeriod), + TokensPerPeriod = myOptions.TokensPerPeriod, + AutoReplenishment = myOptions.AutoReplenishment + }); + } - if (!IPAddress.IsLoopback(remoteIPaddress!)) - { - return RateLimitPartition.GetTokenBucketLimiter - (remoteIPaddress!, key => - new TokenBucketRateLimiterOptions - { - TokenLimit = myOptions.tokenLimit2, - QueueProcessingOrder = QueueProcessingOrder.OldestFirst, - QueueLimit = myOptions.queueLimit, - ReplenishmentPeriod = - TimeSpan.FromSeconds(myOptions.replenishmentPeriod), - TokensPerPeriod = myOptions.tokensPerPeriod, - AutoReplenishment = myOptions.autoReplenishment - }); - } - else - { - return RateLimitPartition.GetNoLimiter(IPAddress.Loopback); - } + return RateLimitPartition.GetNoLimiter(IPAddress.Loopback); + }); }); -app.UseRateLimiter(options); +var app = builder.Build(); + +if (app.Environment.IsDevelopment()) +{ + app.UseMigrationsEndPoint(); +} +else +{ + app.UseExceptionHandler("/Error"); + app.UseHsts(); +} + +app.UseHttpsRedirection(); +app.UseStaticFiles(); + +app.UseRouting(); + +// +// Preceding code removed for brevity. + +app.UseAuthentication(); +app.UseAuthorization(); app.MapRazorPages().RequireRateLimiting(userPolicyName); app.MapDefaultControllerRoute(); static string GetUserEndPoint(HttpContext context) => - $"User {context.User?.Identity?.Name ?? "Anonymous"} endpoint:{context.Request.Path}" + $"User {context.User.Identity?.Name ?? "Anonymous"} endpoint:{context.Request.Path}" + $" {context.Connection.RemoteIpAddress}"; static string GetTicks() => (DateTime.Now.Ticks & 0x11111).ToString("00000"); @@ -323,6 +317,50 @@ static string GetUserEndPoint(HttpContext context) => builder.Services.AddRazorPages(); builder.Services.AddControllersWithViews(); +// +var getPolicyName = "get"; +var postPolicyName = "post"; +var myOptions = new MyRateLimitOptions(); +builder.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); + +builder.Services.AddRateLimiter(_ => _ + .AddConcurrencyLimiter(policyName: getPolicyName, options => + { + options.PermitLimit = myOptions.PermitLimit; + options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; + options.QueueLimit = myOptions.QueueLimit; + }) + .AddPolicy(policyName: postPolicyName, partitioner: httpContext => + { + string userName = httpContext.User.Identity?.Name ?? string.Empty; + + if (!StringValues.IsNullOrEmpty(userName)) + { + return RateLimitPartition.GetTokenBucketLimiter(userName, _ => + new TokenBucketRateLimiterOptions + { + TokenLimit = myOptions.TokenLimit2, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = myOptions.QueueLimit, + ReplenishmentPeriod = TimeSpan.FromSeconds(myOptions.ReplenishmentPeriod), + TokensPerPeriod = myOptions.TokensPerPeriod, + AutoReplenishment = myOptions.AutoReplenishment + }); + } + + return RateLimitPartition.GetTokenBucketLimiter("Anon", _ => + new TokenBucketRateLimiterOptions + { + TokenLimit = myOptions.TokenLimit, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = myOptions.QueueLimit, + ReplenishmentPeriod = TimeSpan.FromSeconds(myOptions.ReplenishmentPeriod), + TokensPerPeriod = myOptions.TokensPerPeriod, + AutoReplenishment = true + }); + })); +// + var app = builder.Build(); if (app.Environment.IsDevelopment()) @@ -343,57 +381,8 @@ static string GetUserEndPoint(HttpContext context) => app.UseAuthentication(); app.UseAuthorization(); -// -var getPolicyName = "get"; -var postPolicyName = "post"; -var myOptions = new MyRateLimitOptions(); -app.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); - -app.UseRateLimiter(new RateLimiterOptions() - .AddConcurrencyLimiter(policyName: getPolicyName, - options => - { - options.PermitLimit = myOptions.permitLimit; - options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; - options.QueueLimit = myOptions.queueLimit; - }) - .AddPolicy(policyName: postPolicyName, partitioner: httpContext => - { - string userName = httpContext?.User?.Identity?.Name ?? string.Empty; - - if (!StringValues.IsNullOrEmpty(userName)) - { - return RateLimitPartition.GetTokenBucketLimiter(userName, key => - new TokenBucketRateLimiterOptions - { - TokenLimit = myOptions.tokenLimit2, - QueueProcessingOrder = QueueProcessingOrder.OldestFirst, - QueueLimit = myOptions.queueLimit, - ReplenishmentPeriod = - TimeSpan.FromSeconds(myOptions.replenishmentPeriod), - TokensPerPeriod = myOptions.tokensPerPeriod, - AutoReplenishment = myOptions.autoReplenishment - }); - } - else - { - return RateLimitPartition.GetTokenBucketLimiter("Anon", key => - new TokenBucketRateLimiterOptions - { - TokenLimit = myOptions.tokenLimit, - QueueProcessingOrder = QueueProcessingOrder.OldestFirst, - QueueLimit = myOptions.queueLimit, - ReplenishmentPeriod = - TimeSpan.FromSeconds(myOptions.replenishmentPeriod), - TokensPerPeriod = myOptions.tokensPerPeriod, - AutoReplenishment = true - }); - } - })); -// - static string GetUserEndPointMethod(HttpContext context) => - $"Hello {context.User?.Identity?.Name ?? "Anonymous"} " + + $"Hello {context.User.Identity?.Name ?? "Anonymous"} " + $"Endpoint:{context.Request.Path} Method: {context.Request.Method}"; app.MapGet("/test", (HttpContext context) => $"{GetUserEndPointMethod(context)}") @@ -410,7 +399,6 @@ static string GetUserEndPointMethod(HttpContext context) => // using System.Threading.RateLimiting; using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.RateLimiting; using Microsoft.Extensions.Primitives; using WebRateLimitAuth.Models; @@ -419,54 +407,49 @@ static string GetUserEndPointMethod(HttpContext context) => builder.Services.AddAuthorization(); builder.Services.AddAuthentication("Bearer").AddJwtBearer(); -var app = builder.Build(); - -app.UseAuthorization(); - -var jwtPolicyName = "jwt"; var myOptions = new MyRateLimitOptions(); -app.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); +builder.Configuration.GetSection(MyRateLimitOptions.MyRateLimit).Bind(myOptions); +var jwtPolicyName = "jwt"; -var options = new RateLimiterOptions() +builder.Services.AddRateLimiter(limiterOptions => { - RejectionStatusCode = StatusCodes.Status429TooManyRequests -} - .AddPolicy(policyName: jwtPolicyName, partitioner: httpContext => - { - var accessToken = httpContext?.Features?.Get()? - .AuthenticateResult?.Properties?.GetTokenValue("access_token")?.ToString() - ?? string.Empty; - if (!StringValues.IsNullOrEmpty(accessToken)) - { - return RateLimitPartition.GetTokenBucketLimiter(accessToken, key => - new TokenBucketRateLimiterOptions - { - TokenLimit = myOptions.tokenLimit2, - QueueProcessingOrder = QueueProcessingOrder.OldestFirst, - QueueLimit = myOptions.queueLimit, - ReplenishmentPeriod = - TimeSpan.FromSeconds(myOptions.replenishmentPeriod), - TokensPerPeriod = myOptions.tokensPerPeriod, - AutoReplenishment = myOptions.autoReplenishment - }); - } - else - { - return RateLimitPartition.GetTokenBucketLimiter("Anon", key => - new TokenBucketRateLimiterOptions - { - TokenLimit = myOptions.tokenLimit, - QueueProcessingOrder = QueueProcessingOrder.OldestFirst, - QueueLimit = myOptions.queueLimit, - ReplenishmentPeriod = - TimeSpan.FromSeconds(myOptions.replenishmentPeriod), - TokensPerPeriod = myOptions.tokensPerPeriod, - AutoReplenishment = true - }); - } - }); - -app.UseRateLimiter(options); + limiterOptions.RejectionStatusCode = StatusCodes.Status429TooManyRequests; + limiterOptions.AddPolicy(policyName: jwtPolicyName, partitioner: httpContext => + { + var accessToken = httpContext.Features.Get()? + .AuthenticateResult?.Properties?.GetTokenValue("access_token")?.ToString() + ?? string.Empty; + + if (!StringValues.IsNullOrEmpty(accessToken)) + { + return RateLimitPartition.GetTokenBucketLimiter(accessToken, _ => + new TokenBucketRateLimiterOptions + { + TokenLimit = myOptions.TokenLimit2, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = myOptions.QueueLimit, + ReplenishmentPeriod = TimeSpan.FromSeconds(myOptions.ReplenishmentPeriod), + TokensPerPeriod = myOptions.TokensPerPeriod, + AutoReplenishment = myOptions.AutoReplenishment + }); + } + + return RateLimitPartition.GetTokenBucketLimiter("Anon", _ => + new TokenBucketRateLimiterOptions + { + TokenLimit = myOptions.TokenLimit, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = myOptions.QueueLimit, + ReplenishmentPeriod = TimeSpan.FromSeconds(myOptions.ReplenishmentPeriod), + TokensPerPeriod = myOptions.TokensPerPeriod, + AutoReplenishment = true + }); + }); +}); + +var app = builder.Build(); + +app.UseAuthorization(); app.MapGet("/", () => "Hello, World!"); @@ -481,8 +464,7 @@ static string GetUserEndPointMethod(HttpContext context) => app.Run(); static string GetUserEndPointMethod(HttpContext context) => - $"Hello {context.User?.Identity?.Name ?? "Anonymous"} " + + $"Hello {context.User.Identity?.Name ?? "Anonymous"} " + $"Endpoint:{context.Request.Path} Method: {context.Request.Method}"; - // #endif diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/SampleRateLimiterPolicy.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/SampleRateLimiterPolicy.cs index 03aabb16..064760d4 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/SampleRateLimiterPolicy.cs +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/SampleRateLimiterPolicy.cs @@ -24,22 +24,20 @@ public SampleRateLimiterPolicy(ILogger logger, _options = options.Value; } - public Func? - OnRejected { get => _onRejected; } + public Func? OnRejected => _onRejected; // public RateLimitPartition GetPartition(HttpContext httpContext) { - return RateLimitPartition.GetSlidingWindowLimiter(string.Empty, - key => new SlidingWindowRateLimiterOptions + return RateLimitPartition.GetSlidingWindowLimiter(string.Empty, + _ => new SlidingWindowRateLimiterOptions { - PermitLimit = _options.permitLimit, + PermitLimit = _options.PermitLimit, QueueProcessingOrder = QueueProcessingOrder.OldestFirst, - QueueLimit = _options.queueLimit, - Window = TimeSpan.FromSeconds(_options.window), - SegmentsPerWindow = _options.segmentsPerWindow + QueueLimit = _options.QueueLimit, + Window = TimeSpan.FromSeconds(_options.Window), + SegmentsPerWindow = _options.SegmentsPerWindow }); - } } // diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Index.cshtml b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Index.cshtml similarity index 67% rename from fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Index.cshtml rename to fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Index.cshtml index deefb8d1..fd8ee7af 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Index.cshtml +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Index.cshtml @@ -3,5 +3,5 @@ }
    -

    MVC controller home2 page

    +

    MVC controller home page

    diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Privacy.cshtml b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Privacy.cshtml similarity index 100% rename from fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Privacy.cshtml rename to fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Privacy.cshtml diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/appsettings.Development.json b/fundamentals/middleware/rate-limit/WebRateLimitAuth/appsettings.Development.json index d3279b1f..e4ce60e6 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/appsettings.Development.json +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/appsettings.Development.json @@ -7,15 +7,15 @@ } }, "MyRateLimit": { - "permitLimit": "4", - "window": "3", - "replenishmentPeriod": "1", - "queueLimit": "2", - "segmentsPerWindow": "2", - "tokenLimit": 4, - "tokenLimit2": 6, - "tokensPerPeriod": 4, - "autoReplenishment": true + "PermitLimit": "10", + "Window": "3", + "ReplenishmentPeriod": "1", + "QueueLimit": "2", + "SegmentsPerWindow": "2", + "TokenLimit": 4, + "TokenLimit2": 6, + "TokensPerPeriod": 4, + "AutoReplenishment": true }, "Authentication": { "Schemes": { diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/appsettings.json b/fundamentals/middleware/rate-limit/WebRateLimitAuth/appsettings.json index 4ff58e94..b6f07f57 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/appsettings.json +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/appsettings.json @@ -10,14 +10,14 @@ }, "AllowedHosts": "*", "MyRateLimit": { - "permitLimit": "10", - "window": "2", - "replenishmentPeriod": "1", - "queueLimit": "10", - "segmentsPerWindow": "4", - "tokenLimit": 8, - "tokenLimit2": 12, - "tokensPerPeriod": 4, - "autoReplenishment": true + "PermitLimit": "10", + "Window": "2", + "ReplenishmentPeriod": "1", + "QueueLimit": "10", + "SegmentsPerWindow": "4", + "TokenLimit": 8, + "TokenLimit2": 12, + "TokensPerPeriod": 4, + "AutoReplenishment": true } } From 7b7c868055e08df17d28f3367ed01413686a171a Mon Sep 17 00:00:00 2001 From: Fiyaz Bin Hasan Date: Thu, 13 Oct 2022 07:32:57 +0600 Subject: [PATCH 2/3] rename HomeController back to Home2Controller --- .../{HomeController.cs => Home2Controller.cs} | 6 +++--- .../WebRateLimitAuth/Pages/Shared/_Layout.cshtml | 4 ++-- .../middleware/rate-limit/WebRateLimitAuth/Program.cs | 4 ++-- .../Views/{Home => Home2}/Index.cshtml | 0 .../Views/{Home => Home2}/Privacy.cshtml | 0 .../WebRateLimitAuth/Views/Shared/_Layout.cshtml | 8 ++++---- .../WebRateLimitAuth/appsettings.Development.json | 10 +++++----- .../rate-limit/WebRateLimitAuth/appsettings.json | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) rename fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/{HomeController.cs => Home2Controller.cs} (79%) rename fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/{Home => Home2}/Index.cshtml (100%) rename fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/{Home => Home2}/Privacy.cshtml (100%) diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/HomeController.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/Home2Controller.cs similarity index 79% rename from fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/HomeController.cs rename to fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/Home2Controller.cs index 5b0010dc..6ebd1342 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/HomeController.cs +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Controllers/Home2Controller.cs @@ -4,11 +4,11 @@ namespace WebRateLimitAuth.Controllers; -public class HomeController : Controller +public class Home2Controller : Controller { - private readonly ILogger _logger; + private readonly ILogger _logger; - public HomeController(ILogger logger) + public Home2Controller(ILogger logger) { _logger = logger; } diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Pages/Shared/_Layout.cshtml b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Pages/Shared/_Layout.cshtml index 11e86e51..c476ede1 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Pages/Shared/_Layout.cshtml +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Pages/Shared/_Layout.cshtml @@ -26,10 +26,10 @@ RP Privacy
  • - MVC Home + MVC Home
  • - MVC Privacy + MVC Privacy
  • /b diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Program.cs b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Program.cs index 30518395..6841224b 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Program.cs +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Program.cs @@ -458,8 +458,8 @@ static string GetUserEndPointMethod(HttpContext context) => .RequireAuthorization(); app.MapPost("/post", (HttpContext context) => $"Hello {GetUserEndPointMethod(context)}") - .RequireRateLimiting(jwtPolicyName) - .RequireAuthorization(); + .RequireRateLimiting(jwtPolicyName) + .RequireAuthorization(); app.Run(); diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Index.cshtml b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Index.cshtml similarity index 100% rename from fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Index.cshtml rename to fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Index.cshtml diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Privacy.cshtml b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Privacy.cshtml similarity index 100% rename from fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home/Privacy.cshtml rename to fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Home2/Privacy.cshtml diff --git a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Shared/_Layout.cshtml b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Shared/_Layout.cshtml index 4421f84d..ad9af4c8 100644 --- a/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Shared/_Layout.cshtml +++ b/fundamentals/middleware/rate-limit/WebRateLimitAuth/Views/Shared/_Layout.cshtml @@ -12,7 +12,7 @@