add controller detection in line with .net controller conditions

SharpGrip · Dec 4, 2024 · 55bb386 · 55bb386
1 parent 3b79ae3
commit 55bb386
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/...ntValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs b/...ntValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using FluentValidation;
 using Microsoft.AspNetCore.Http;
@@ -31,7 +32,7 @@ public FluentValidationAutoValidationActionFilter(IFluentValidationAutoValidatio
 
         public async Task OnActionExecutionAsync(ActionExecutingContext actionExecutingContext, ActionExecutionDelegate next)
         {
-            if (actionExecutingContext.Controller is ControllerBase || actionExecutingContext.Controller.GetType().HasCustomAttribute<ControllerAttribute>())
+            if (IsValidController(actionExecutingContext.Controller))
             {
                 var endpoint = actionExecutingContext.HttpContext.GetEndpoint();
                 var controllerActionDescriptor = (ControllerActionDescriptor) actionExecutingContext.ActionDescriptor;
@@ -119,6 +120,21 @@ public async Task OnActionExecutionAsync(ActionExecutingContext actionExecutingC
             await next();
         }
 
+        private bool IsValidController(object controller)
+        {
+            var controllerType = controller.GetType();
+
+            if (controllerType.HasCustomAttribute<NonControllerAttribute>())
+            {
+                return false;
+            }
+
+            return controller is ControllerBase ||
+                   controllerType.HasCustomAttribute<ControllerAttribute>() ||
+                   controllerType.Name.EndsWith("Controller", StringComparison.OrdinalIgnoreCase) ||
+                   controllerType.InheritsFromTypeWithNameEndingIn("Controller");
+        }
+
         private bool HasValidBindingSource(BindingSource? bindingSource)
         {
             return (autoValidationMvcConfiguration.EnableBodyBindingSourceAutomaticValidation && bindingSource == BindingSource.Body) ||

diff --git a/FluentValidation.AutoValidation.Shared/src/Extensions/TypeExtensions.cs b/FluentValidation.AutoValidation.Shared/src/Extensions/TypeExtensions.cs
@@ -25,5 +25,20 @@ public static bool HasCustomAttribute<TAttribute>(this Type type) where TAttribu
         {
             return type.CustomAttributes.Any(attribute => attribute.AttributeType == typeof(TAttribute));
         }
+
+        public static bool InheritsFromTypeWithNameEndingIn(this Type type, string name)
+        {
+            while (type.BaseType != null)
+            {
+                type = type.BaseType;
+
+                if (type.Name.EndsWith(name, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }