[release/7.0-preview6] Update dependencies from dotnet/runtime dotnet/efcore & Make RateLimitingMiddleware endpoint-aware

src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs

@@ -16,7 +16,7 @@ public class MemoryOutputCacheStoreTests
     public async Task StoreAndGetValue_Succeeds()
     {
         var store = new MemoryOutputCacheStore(new MemoryCache(new MemoryCacheOptions()));
-        var value = "abc"u8;
+        var value = "abc"u8.ToArray();
         var key = "abc";
 
         await store.SetAsync(key, value, null, TimeSpan.FromMinutes(1), default);
@@ -31,7 +31,7 @@ public async Task StoreAndGetValue_TimesOut()
     {
         var testClock = new TestMemoryOptionsClock { UtcNow = DateTimeOffset.UtcNow };
         var store = new MemoryOutputCacheStore(new MemoryCache(new MemoryCacheOptions { Clock = testClock }));
-        var value = "abc"u8;
+        var value = "abc"u8.ToArray();
         var key = "abc";
 
         await store.SetAsync(key, value, null, TimeSpan.FromMilliseconds(5), default);
@@ -46,7 +46,7 @@ public async Task StoreAndGetValue_TimesOut()
     public async Task StoreNullKey_ThrowsException()
     {
         var store = new MemoryOutputCacheStore(new MemoryCache(new MemoryCacheOptions()));
-        var value = "abc"u8;
+        var value = "abc"u8.ToArray();
         string key = null;
 
         _ = await Assert.ThrowsAsync<ArgumentNullException>("key", () => store.SetAsync(key, value, null, TimeSpan.FromMilliseconds(5), default).AsTask());
@@ -67,7 +67,7 @@ public async Task EvictByTag_SingleTag_SingleEntry()
     {
         var testClock = new TestMemoryOptionsClock { UtcNow = DateTimeOffset.UtcNow };
         var store = new MemoryOutputCacheStore(new MemoryCache(new MemoryCacheOptions { Clock = testClock }));
-        var value = "abc"u8;
+        var value = "abc"u8.ToArray();
         var key = "abc";
         var tags = new string[] { "tag1" };
 
@@ -83,7 +83,7 @@ public async Task EvictByTag_SingleTag_MultipleEntries()
     {
         var testClock = new TestMemoryOptionsClock { UtcNow = DateTimeOffset.UtcNow };
         var store = new MemoryOutputCacheStore(new MemoryCache(new MemoryCacheOptions { Clock = testClock }));
-        var value = "abc"u8;
+        var value = "abc"u8.ToArray();
         var key1 = "abc";
         var key2 = "def";
         var tags = new string[] { "tag1" };
@@ -103,7 +103,7 @@ public async Task EvictByTag_MultipleTags_SingleEntry()
     {
         var testClock = new TestMemoryOptionsClock { UtcNow = DateTimeOffset.UtcNow };
         var store = new MemoryOutputCacheStore(new MemoryCache(new MemoryCacheOptions { Clock = testClock }));
-        var value = "abc"u8;
+        var value = "abc"u8.ToArray();
         var key = "abc";
         var tags = new string[] { "tag1", "tag2" };
 
@@ -119,7 +119,7 @@ public async Task EvictByTag_MultipleTags_MultipleEntries()
     {
         var testClock = new TestMemoryOptionsClock { UtcNow = DateTimeOffset.UtcNow };
         var store = new MemoryOutputCacheStore(new MemoryCache(new MemoryCacheOptions { Clock = testClock }));
-        var value = "abc"u8;
+        var value = "abc"u8.ToArray();
         var key1 = "abc";
         var key2 = "def";
         var tags1 = new string[] { "tag1", "tag2" };

src/Middleware/OutputCaching/test/OutputCacheEntryFormatterTests.cs

@@ -38,7 +38,7 @@ public async Task StoreAndGet_StoresAllValues()
         var key = "abc";
         var entry = new OutputCacheEntry()
         {
-            Body = new CachedResponseBody(new List<byte[]>() { "lorem"u8, "ipsum"u8 }, 10),
+            Body = new CachedResponseBody(new List<byte[]>() { "lorem"u8.ToArray(), "ipsum"u8.ToArray() }, 10),
             Created = DateTimeOffset.UtcNow,
             Headers = new HeaderDictionary { [HeaderNames.Accept] = "text/plain", [HeaderNames.AcceptCharset] = "utf8" },
             StatusCode = StatusCodes.Status201Created,

src/Middleware/RateLimiting/src/DefaultCombinedLease.cs

@@ -0,0 +1,98 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading.RateLimiting;
+
+namespace Microsoft.AspNetCore.RateLimiting;
+
+internal sealed class DefaultCombinedLease : RateLimitLease
+{
+    private readonly RateLimitLease? _globalLease;
+    private readonly RateLimitLease _endpointLease;
+    private HashSet<string>? _metadataNames;
+
+    public DefaultCombinedLease(RateLimitLease? globalLease, RateLimitLease endpointLease)
+    {
+        _globalLease = globalLease;
+        _endpointLease = endpointLease;
+    }
+
+    public override bool IsAcquired => true;
+
+    public override IEnumerable<string> MetadataNames
+    {
+        get
+        {
+            if (_metadataNames is null)
+            {
+                _metadataNames = new HashSet<string>();
+                if (_globalLease is not null)
+                {
+                    foreach (string metadataName in _globalLease.MetadataNames)
+                    {
+                        _metadataNames.Add(metadataName);
+                    }
+                }
+                foreach (string metadataName in _endpointLease.MetadataNames)
+                {
+                    _metadataNames.Add(metadataName);
+                }
+            }
+            return _metadataNames;
+        }
+    }
+
+    public override bool TryGetMetadata(string metadataName, out object? metadata)
+    {
+        // Use the first metadata item of a given name, ignore duplicates, we can't reliably merge arbitrary metadata
+        // Creating an object[] if there are multiple of the same metadataName could work, but makes consumption of metadata messy
+        // and makes MetadataName.Create<T>(...) uses no longer work
+        if (_endpointLease.TryGetMetadata(metadataName, out metadata))
+        {
+            return true;
+        }
+        if (_globalLease is not null)
+        {
+            if (_globalLease.TryGetMetadata(metadataName, out metadata))
+            {
+                return true;
+            }
+        }
+
+        metadata = null;
+        return false;
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        List<Exception>? exceptions = null;
+
+        // Dispose endpoint lease first, then global lease (reverse order of when they were acquired)
+        // Avoids issues where dispose might unblock a queued acquire and then the acquire fails when acquiring the next limiter.
+        // When disposing in reverse order there wont be any issues of unblocking an acquire that affects acquires on limiters in the chain after it
+        try
+        {
+            _endpointLease.Dispose();
+        }
+        catch (Exception ex)
+        {
+            exceptions ??= new List<Exception>();
+            exceptions.Add(ex);
+        }
+
+        try
+        {
+            _globalLease?.Dispose();
+        }
+        catch (Exception ex)
+        {
+            exceptions ??= new List<Exception>();
+            exceptions.Add(ex);
+        }
+
+        if (exceptions is not null)
+        {
+            throw new AggregateException(exceptions);
+        }
+    }
+}

src/Middleware/RateLimiting/src/DefaultKeyType.T.cs

@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.RateLimiting;
+
+internal sealed class DefaultKeyType<TKey>: DefaultKeyType
+{
+    private readonly TKey _key;
+
+    public DefaultKeyType(TKey key)
+    {
+        _key = key;
+    }
+
+    public override object? GetKey()
+    {
+        return _key;
+    }
+}

src/Middleware/RateLimiting/src/DefaultKeyType.cs

@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.RateLimiting;
+
+internal abstract class DefaultKeyType
+{
+    public abstract object? GetKey();
+}

src/Middleware/RateLimiting/src/DefaultKeyTypeEqualityComparer.cs

@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.RateLimiting;
+internal class DefaultKeyTypeEqualityComparer : IEqualityComparer<DefaultKeyType>
+{
+    public bool Equals(DefaultKeyType? x, DefaultKeyType? y)
+    {
+        if (x == null && y == null)
+        {
+            return true;
+        }
+        else if (x == null || y == null)
+        {
+            return false;
+        }
+
+        var xKey = x.GetKey();
+        var yKey = y.GetKey();
+        if (xKey == null && yKey == null)
+        {
+            return true;
+        }
+        else if (xKey == null || yKey == null)
+        {
+            return false;
+        }
+
+        return xKey.Equals(yKey);
+    }
+
+    public int GetHashCode([DisallowNull] DefaultKeyType obj)
+    {
+        var key = obj.GetKey();
+        if (key is not null)
+        {
+            return key.GetHashCode();
+        }
+        // REVIEW - is this reasonable?
+        return default;
+    }
+}

src/Middleware/RateLimiting/src/DefaultRateLimiterPolicy.cs

@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading.RateLimiting;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.RateLimiting;
+internal sealed class DefaultRateLimiterPolicy : IRateLimiterPolicy<DefaultKeyType>
+{
+    private readonly Func<HttpContext, RateLimitPartition<DefaultKeyType>> _partitioner;
+    private readonly Func<OnRejectedContext, CancellationToken, ValueTask>? _onRejected;
+
+    public DefaultRateLimiterPolicy(Func<HttpContext, RateLimitPartition<DefaultKeyType>> partitioner, Func<OnRejectedContext, CancellationToken, ValueTask>? onRejected)
+    {
+        _partitioner = partitioner;
+        _onRejected = onRejected;
+    }
+
+    public Func<OnRejectedContext, CancellationToken, ValueTask>? OnRejected => _onRejected;
+
+    public RateLimitPartition<DefaultKeyType> GetPartition(HttpContext httpContext)
+    {
+        return _partitioner(httpContext);
+    }
+}

src/Middleware/RateLimiting/src/IRateLimiterMetadata.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.RateLimiting;
+
+/// <summary>
+/// An interface which can be used to identify a type which provides metadata needed for enabling request rate limiting support.
+/// </summary>
+internal interface IRateLimiterMetadata
+{
+    /// <summary>
+    /// The name of the limiter which needs to be applied.
+    /// </summary>
+    string PolicyName { get; }
+}

src/Middleware/RateLimiting/src/IRateLimiterPolicy.cs

@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading.RateLimiting;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.RateLimiting;
+
+/// <summary>
+/// An interface which is used to represent a RateLimiter policy.
+/// </summary>
+public interface IRateLimiterPolicy<TPartitionKey>
+{
+    /// <summary>
+    /// Gets the <see cref="Func{OnRejectedContext, CancellationToken, ValueTask}"/> that handles requests rejected by this middleware.
+    /// </summary>
+    Func<OnRejectedContext, CancellationToken, ValueTask>? OnRejected { get; }
+
+    /// <summary>
+    /// Gets the <see cref="RateLimitPartition{TPartitionKey}"/> that applies to the given <see cref="HttpContext"/>.
+    /// </summary>
+    /// <param name="httpContext">The <see cref="HttpContext"/> to get the partition for.</param>
+    RateLimitPartition<TPartitionKey> GetPartition(HttpContext httpContext);
+}

src/Middleware/RateLimiting/src/LeaseContext.cs

@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading.RateLimiting;
+
+namespace Microsoft.AspNetCore.RateLimiting;
+internal struct LeaseContext : IDisposable
+{
+    public bool? GlobalRejected { get; init; }
+
+    public required RateLimitLease Lease { get; init; }
+
+    public void Dispose()
+    {
+        Lease.Dispose();
+    }
+}

src/Middleware/RateLimiting/src/OnRejectedContext.cs

@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading.RateLimiting;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.RateLimiting;
+
+/// <summary>
+/// Holds state needed for the OnRejected callback in the RateLimitingMiddleware.
+/// </summary>
+public sealed class OnRejectedContext
+{
+    /// <summary>
+    /// Gets or sets the <see cref="HttpContext"/> that the OnRejected callback will have access to
+    /// </summary>
+    public required HttpContext HttpContext { get; init; }
+
+    /// <summary>
+    /// Gets or sets the failed <see cref="RateLimitLease"/> that the OnRejected callback will have access to
+    /// </summary>
+    public required RateLimitLease Lease { get; init; }
+}