Updating to use MaxValidationDepth

Author: brunolins16

src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.Manual.cs

@@ -13,6 +13,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
 {
     public partial class ModelStateDictionary
     {
-        internal int MaxRecursionDepth { get; set; }
+        internal int? MaxValidationDepth { get; set; }
     }
 }

src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateDictionary.cs

@@ -30,7 +30,7 @@ public class ModelStateDictionary : IReadOnlyDictionary<string, ModelStateEntry>
 
         private readonly ModelStateNode _root;
         private int _maxAllowedErrors;
-        private int _maxRecursionDepth;
+        private int? _maxValidationDepth;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelStateDictionary"/> class.
@@ -44,9 +44,17 @@ public ModelStateDictionary()
         /// Initializes a new instance of the <see cref="ModelStateDictionary"/> class.
         /// </summary>
         public ModelStateDictionary(int maxAllowedErrors)
+            : this (maxAllowedErrors, DefaultMaxRecursionDepth)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelStateDictionary"/> class.
+        /// </summary>
+        private ModelStateDictionary(int maxAllowedErrors, int maxValidationDepth)
         {
             MaxAllowedErrors = maxAllowedErrors;
-            MaxRecursionDepth = DefaultMaxRecursionDepth;
+            MaxValidationDepth = maxValidationDepth;
             var emptySegment = new StringSegment(buffer: string.Empty);
             _root = new ModelStateNode(subKey: emptySegment)
             {
@@ -60,7 +68,7 @@ public ModelStateDictionary(int maxAllowedErrors)
         /// </summary>
         /// <param name="dictionary">The <see cref="ModelStateDictionary"/> to copy values from.</param>
         public ModelStateDictionary(ModelStateDictionary dictionary)
-            : this(dictionary?.MaxAllowedErrors ?? DefaultMaxAllowedErrors)
+            : this(dictionary?.MaxAllowedErrors ?? DefaultMaxAllowedErrors, dictionary?.MaxValidationDepth ?? DefaultMaxRecursionDepth)
         {
             if (dictionary == null)
             {
@@ -176,19 +184,19 @@ public ModelStateEntry this[string key]
         // Flag that indicates if TooManyModelErrorException has already been added to this dictionary.
         private bool HasRecordedMaxModelError { get; set; }
 
-        internal int MaxRecursionDepth
+        internal int? MaxValidationDepth
         {
             get
             {
-                return _maxRecursionDepth;
+                return _maxValidationDepth;
             }
             set
             {
                 if (value < 0)
                 {
                     throw new ArgumentOutOfRangeException(nameof(value));
                 }
-                _maxRecursionDepth = value;
+                _maxValidationDepth = value;
             }
         }
 
@@ -682,7 +690,8 @@ private static StringSegment FindNext(string key, ref MatchResult currentMatch)
 
         private ModelValidationState? GetValidity(ModelStateNode node, int currentDepth)
         {
-            if (node == null || currentDepth >= MaxRecursionDepth)
+            if (node == null ||
+                (MaxValidationDepth != null && currentDepth >= MaxValidationDepth))
             {
                 return null;
             }

src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelStateDictionaryTest.cs

@@ -699,7 +699,9 @@ public void GetFieldValidity_ReturnsUnvalidated_IfTreeHeightIsGreaterThanLimit()
         {
             // Arrange
             var dictionary = new ModelStateDictionary();
-            var key = string.Join(".", Enumerable.Repeat("foo", dictionary.MaxRecursionDepth + 1));
+            var stackLimit = 32;
+            var key = string.Join(".", Enumerable.Repeat("foo", stackLimit + 1));
+            dictionary.MaxValidationDepth = stackLimit;
             dictionary.MarkFieldValid(key);
 
             // Act

src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs

@@ -18,7 +18,7 @@ internal class ControllerActionInvokerProvider : IActionInvokerProvider
         private readonly ControllerActionInvokerCache _controllerActionInvokerCache;
         private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
         private readonly int _maxModelValidationErrors;
-        private readonly int _maxModelBindingRecursionDepth;
+        private readonly int? _maxValidationDepth;
         private readonly ILogger _logger;
         private readonly DiagnosticListener _diagnosticListener;
         private readonly IActionResultTypeMapper _mapper;
@@ -45,7 +45,7 @@ public ControllerActionInvokerProvider(
             _controllerActionInvokerCache = controllerActionInvokerCache;
             _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
             _maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors;
-            _maxModelBindingRecursionDepth = optionsAccessor.Value.MaxModelBindingRecursionDepth;
+            _maxValidationDepth = optionsAccessor.Value.MaxValidationDepth;
             _logger = loggerFactory.CreateLogger<ControllerActionInvoker>();
             _diagnosticListener = diagnosticListener;
             _mapper = mapper;
@@ -70,7 +70,7 @@ public void OnProvidersExecuting(ActionInvokerProviderContext context)
                     ValueProviderFactories = new CopyOnWriteList<IValueProviderFactory>(_valueProviderFactories)
                 };
                 controllerContext.ModelState.MaxAllowedErrors = _maxModelValidationErrors;
-                controllerContext.ModelState.MaxRecursionDepth = _maxModelBindingRecursionDepth;
+                controllerContext.ModelState.MaxValidationDepth = _maxValidationDepth;
 
                 var (cacheEntry, filters) = _controllerActionInvokerCache.GetCachedResult(controllerContext);