Make route handler filters work for MVC controllers

src/Http/Http.Abstractions/src/Extensions/EndpointBuilder.cs

@@ -10,6 +10,11 @@ namespace Microsoft.AspNetCore.Builder;
 /// </summary>
 public abstract class EndpointBuilder
 {
+    /// <summary>
+    /// Gets the list of filters that apply to this endpoint.
+    /// </summary>
+    public IList<Func<EndpointFilterFactoryContext, EndpointFilterDelegate, EndpointFilterDelegate>> FilterFactories { get; } = new List<Func<EndpointFilterFactoryContext, EndpointFilterDelegate, EndpointFilterDelegate>>();
+
     /// <summary>
     /// Gets or sets the delegate used to process requests for the endpoint.
     /// </summary>

src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt

@@ -6,6 +6,7 @@ abstract Microsoft.AspNetCore.Http.EndpointFilterInvocationContext.GetArgument<T
 abstract Microsoft.AspNetCore.Http.EndpointFilterInvocationContext.HttpContext.get -> Microsoft.AspNetCore.Http.HttpContext!
 Microsoft.AspNetCore.Builder.EndpointBuilder.ApplicationServices.get -> System.IServiceProvider!
 Microsoft.AspNetCore.Builder.EndpointBuilder.ApplicationServices.set -> void
+Microsoft.AspNetCore.Builder.EndpointBuilder.FilterFactories.get -> System.Collections.Generic.IList<System.Func<Microsoft.AspNetCore.Http.EndpointFilterFactoryContext!, Microsoft.AspNetCore.Http.EndpointFilterDelegate!, Microsoft.AspNetCore.Http.EndpointFilterDelegate!>!>!
 Microsoft.AspNetCore.Http.AsParametersAttribute
 Microsoft.AspNetCore.Http.AsParametersAttribute.AsParametersAttribute() -> void
 Microsoft.AspNetCore.Http.CookieBuilder.Extensions.get -> System.Collections.Generic.IList<string!>!

src/Http/Routing/src/Builder/EndpointFilterExtensions.cs

@@ -112,13 +112,7 @@ public static TBuilder AddEndpointFilterFactory<TBuilder>(this TBuilder builder,
     {
         builder.Add(endpointBuilder =>
         {
-            if (endpointBuilder is not RouteEndpointBuilder routeEndpointBuilder)
-            {
-                return;
-            }
-
-            routeEndpointBuilder.EndpointFilterFactories ??= new();
-            routeEndpointBuilder.EndpointFilterFactories.Add(filterFactory);
+            endpointBuilder.FilterFactories.Add(filterFactory);
         });
 
         return builder;

src/Http/Routing/src/Patterns/RoutePatternFactory.cs

@@ -1084,7 +1084,15 @@ public static RoutePatternParameterPolicyReference ParameterPolicy(string parame
         return ParameterPolicyCore(parameterPolicy);
     }
 
-    internal static RoutePattern Combine(RoutePattern? left, RoutePattern right)
+    /// <summary>
+    /// Creates a <see cref="RoutePattern"/> that combines the specified patterns.
+    /// </summary>
+    /// <param name="left">A string representing the first part of the route.</param>
+    /// <param name="right">A stirng representing the second part of the route.</param>
+    /// <returns>The combined <see cref="RoutePattern"/>.</returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    /// <exception cref="RoutePatternException"></exception>
+    public static RoutePattern Combine(RoutePattern? left, RoutePattern right)
     {
         static IReadOnlyDictionary<string, TValue> CombineDictionaries<TValue>(
             IReadOnlyDictionary<string, TValue> leftDictionary,

src/Http/Routing/src/PublicAPI.Unshipped.txt

@@ -33,6 +33,7 @@ static Microsoft.AspNetCore.Routing.LinkGeneratorRouteValuesAddressExtensions.Ge
 static Microsoft.AspNetCore.Routing.LinkGeneratorRouteValuesAddressExtensions.GetPathByRouteValues(this Microsoft.AspNetCore.Routing.LinkGenerator! generator, string? routeName, Microsoft.AspNetCore.Routing.RouteValueDictionary? values = null, Microsoft.AspNetCore.Http.PathString pathBase = default(Microsoft.AspNetCore.Http.PathString), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions? options = null) -> string?
 static Microsoft.AspNetCore.Routing.LinkGeneratorRouteValuesAddressExtensions.GetUriByRouteValues(this Microsoft.AspNetCore.Routing.LinkGenerator! generator, Microsoft.AspNetCore.Http.HttpContext! httpContext, string? routeName, Microsoft.AspNetCore.Routing.RouteValueDictionary? values = null, string? scheme = null, Microsoft.AspNetCore.Http.HostString? host = null, Microsoft.AspNetCore.Http.PathString? pathBase = null, Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions? options = null) -> string?
 static Microsoft.AspNetCore.Routing.LinkGeneratorRouteValuesAddressExtensions.GetUriByRouteValues(this Microsoft.AspNetCore.Routing.LinkGenerator! generator, string? routeName, Microsoft.AspNetCore.Routing.RouteValueDictionary! values, string! scheme, Microsoft.AspNetCore.Http.HostString host, Microsoft.AspNetCore.Http.PathString pathBase = default(Microsoft.AspNetCore.Http.PathString), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions? options = null) -> string?
+static Microsoft.AspNetCore.Routing.Patterns.RoutePatternFactory.Combine(Microsoft.AspNetCore.Routing.Patterns.RoutePattern? left, Microsoft.AspNetCore.Routing.Patterns.RoutePattern! right) -> Microsoft.AspNetCore.Routing.Patterns.RoutePattern!
 static Microsoft.AspNetCore.Routing.Patterns.RoutePatternFactory.Parse(string! pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary? defaults, Microsoft.AspNetCore.Routing.RouteValueDictionary? parameterPolicies) -> Microsoft.AspNetCore.Routing.Patterns.RoutePattern!
 static Microsoft.AspNetCore.Routing.Patterns.RoutePatternFactory.Parse(string! pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary? defaults, Microsoft.AspNetCore.Routing.RouteValueDictionary? parameterPolicies, Microsoft.AspNetCore.Routing.RouteValueDictionary? requiredValues) -> Microsoft.AspNetCore.Routing.Patterns.RoutePattern!
 static Microsoft.AspNetCore.Routing.Patterns.RoutePatternFactory.Pattern(Microsoft.AspNetCore.Routing.RouteValueDictionary? defaults, Microsoft.AspNetCore.Routing.RouteValueDictionary? parameterPolicies, System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.Patterns.RoutePatternPathSegment!>! segments) -> Microsoft.AspNetCore.Routing.Patterns.RoutePattern!

src/Http/Routing/src/RouteEndpointBuilder.cs

@@ -12,10 +12,6 @@ namespace Microsoft.AspNetCore.Routing;
 /// </summary>
 public sealed class RouteEndpointBuilder : EndpointBuilder
 {
-    // TODO: Make this public as a gettable IReadOnlyList<Func<RouteHandlerContext, EndpointFilterDelegate, EndpointFilterDelegate>>.
-    // AddEndpointFilter will still be the only way to mutate this list.
-    internal List<Func<EndpointFilterFactoryContext, EndpointFilterDelegate, EndpointFilterDelegate>>? EndpointFilterFactories { get; set; }
-
     /// <summary>
     /// Gets or sets the <see cref="RoutePattern"/> associated with this endpoint.
     /// </summary>

src/Http/Routing/src/RouteEndpointDataSource.cs

@@ -56,7 +56,7 @@ public RouteHandlerBuilder AddRouteHandler(
         if (isFallback)
         {
             routeAttributes |= RouteAttributes.Fallback;
-        }    
+        }
 
         _routeEntries.Add(new()
         {
@@ -196,7 +196,7 @@ private RouteEndpointBuilder CreateRouteEndpointBuilder(
             entrySpecificConvention(builder);
         }
 
-        if (isRouteHandler || builder.EndpointFilterFactories is { Count: > 0})
+        if (isRouteHandler || builder.FilterFactories.Count > 0)
         {
             var routeParamNames = new List<string>(pattern.Parameters.Count);
             foreach (var parameter in pattern.Parameters)
@@ -211,7 +211,7 @@ private RouteEndpointBuilder CreateRouteEndpointBuilder(
                 ThrowOnBadRequest = _throwOnBadRequest,
                 DisableInferBodyFromParameters = ShouldDisableInferredBodyParameters(entry.HttpMethods),
                 EndpointMetadata = builder.Metadata,
-                EndpointFilterFactories = builder.EndpointFilterFactories,
+                EndpointFilterFactories = builder.FilterFactories.AsReadOnly(),
             };
 
             // We ignore the returned EndpointMetadata has been already populated since we passed in non-null EndpointMetadata.

src/Http/Routing/test/UnitTests/RouteEndpointBuilderTest.cs

@@ -45,8 +45,7 @@ public async void Build_DoesNot_RunFilters()
 
         var builder = new RouteEndpointBuilder(requestDelegate, RoutePatternFactory.Parse("/"), defaultOrder);
 
-        builder.EndpointFilterFactories = new List<Func<EndpointFilterFactoryContext, EndpointFilterDelegate, EndpointFilterDelegate>>();
-        builder.EndpointFilterFactories.Add((endopintContext, next) =>
+        builder.FilterFactories.Add((endopintContext, next) =>
         {
             endpointFilterCallCount++;
 

src/Mvc/Mvc.Core/src/Controllers/ControllerActionDescriptor.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.Extensions.Internal;
@@ -36,6 +37,8 @@ public class ControllerActionDescriptor : ActionDescriptor
     /// </summary>
     public TypeInfo ControllerTypeInfo { get; set; } = default!;
 
+    internal EndpointFilterDelegate? FilterDelegate { get; set; }
+
     // Cache entry so we can avoid an external cache
     internal ControllerActionInvokerCacheEntry? CacheEntry { get; set; }