Contactroutes: rate limiting per client met de ClientPartitionKey van de host

ContactRateLimitPartition.KeyFor gebruikt nu ClientPartitionKey.For(context) in plaats van een vaste sleutel; de test controleert dat verschillende clientadressen verschillende buckets krijgen. ForwardedHeaders:KnownProxies moet op elke host staan die de contactroutes inschakelt.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-10 13:25:43 +01:00
co-authored by Claude Sonnet 5.5
parent c3dceb203b
commit 99066f7ed6
2 changed files with 26 additions and 17 deletions
@@ -124,21 +124,31 @@ public class ContactRetentionServiceTests
public class ContactRateLimitPartitionTests public class ContactRateLimitPartitionTests
{ {
/// <summary> /// <summary>
/// REBASE CHECKLIST: on master there is no per-client partitioning, so every caller shares one /// Every contact policy is partitioned per client with the host's own key
/// bucket and this test pins the constant. After the ASF merge the body of /// (<c>ClientPartitionKey</c>): different client addresses never share a bucket.
/// <c>ContactRateLimitPartition.KeyFor</c> becomes <c>return ClientPartitionKey.For(context);</c>
/// and this test changes to "two different client addresses give two different keys".
/// </summary> /// </summary>
[Fact] [Fact]
public void OnTheBaseBranch_EveryCallerSharesOneBucket() public void DifferentClientAddresses_GetDifferentBuckets_AndTheSameAddressTheSameBucket()
{ {
var first = new DefaultHttpContext(); var first = new DefaultHttpContext();
first.Connection.RemoteIpAddress = System.Net.IPAddress.Parse("203.0.113.10"); first.Connection.RemoteIpAddress = System.Net.IPAddress.Parse("203.0.113.10");
var again = new DefaultHttpContext();
again.Connection.RemoteIpAddress = System.Net.IPAddress.Parse("203.0.113.10");
var second = new DefaultHttpContext(); var second = new DefaultHttpContext();
second.Connection.RemoteIpAddress = System.Net.IPAddress.Parse("198.51.100.20"); second.Connection.RemoteIpAddress = System.Net.IPAddress.Parse("198.51.100.20");
ContactRateLimitPartition.KeyFor(first).Should().Be(ContactRateLimitPartition.GlobalKey); ContactRateLimitPartition.KeyFor(first).Should().NotBe(ContactRateLimitPartition.KeyFor(second));
ContactRateLimitPartition.KeyFor(second).Should().Be(ContactRateLimitPartition.GlobalKey); ContactRateLimitPartition.KeyFor(first).Should().Be(ContactRateLimitPartition.KeyFor(again));
ContactRateLimitPartition.GlobalKey.Should().Be("global"); ContactRateLimitPartition.KeyFor(first).Should().Be("203.0.113.10");
}
[Fact]
public void TheKeyIsTheHostsOwnClientKey()
{
var context = new DefaultHttpContext();
context.Connection.RemoteIpAddress = System.Net.IPAddress.Parse("::ffff:192.0.2.7");
ContactRateLimitPartition.KeyFor(context).Should().Be(SlpModularCms.Core.Hosting.Proxy.ClientPartitionKey.For(context));
ContactRateLimitPartition.KeyFor(new DefaultHttpContext()).Should().Be(SlpModularCms.Core.Hosting.Proxy.ClientPartitionKey.Unknown);
} }
} }
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using SlpModularCms.Core.Hosting.Proxy;
using SlpModularCms.Modules.Contact.Data.Entities; using SlpModularCms.Modules.Contact.Data.Entities;
namespace SlpModularCms.Modules.Contact.Services; namespace SlpModularCms.Modules.Contact.Services;
@@ -46,16 +47,14 @@ public sealed class NoOpContactMailSender : IContactMailSender
/// The single place that decides which rate-limit bucket a request belongs to. /// The single place that decides which rate-limit bucket a request belongs to.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// On the base branch the rate limiter has no per-client partitioning (no forwarded-header /// Every contact policy is partitioned per client, with the same key as the other policies of the
/// handling, no client key): every visitor is the same caller. This returns a constant, so the /// host (<see cref="ClientPartitionKey"/>: the remote address as seen by the pipeline, the real
/// contact policies behave as ONE shared bucket per policy, which is why the contact routes are /// visitor once <c>ForwardedHeaders:KnownProxies</c> is configured). That setting is required on
/// disabled (<c>Contact:Enabled=false</c>) until the per-client partitioning from the ASF branch /// every host that enables the contact routes: without it all visitors share the proxy's address,
/// has been merged. Switching to per-client is the one-line change documented in the rebase /// i.e. one bucket for the whole site. The routes stay disabled by default
/// checklist: replace the body with <c>ClientPartitionKey.For(context)</c>. /// (<c>Contact:Enabled=false</c>) until that has been checked on the host.
/// </remarks> /// </remarks>
public static class ContactRateLimitPartition public static class ContactRateLimitPartition
{ {
public const string GlobalKey = "global"; public static string KeyFor(HttpContext context) => ClientPartitionKey.For(context);
public static string KeyFor(HttpContext context) => GlobalKey;
} }