Merge pull request #17423 from abpframework/ValidationAttributeHelper

Catch and ignore the `Exception` from `ValidationAttributeHelper`.
abpframework · Aug 21, 2023 · ed6d9f4 · ed6d9f4
2 parents 453b1eb + 07ec945
commit ed6d9f4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/....AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/Metadata/AbpModelMetadataProvider.cs b/....AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/Metadata/AbpModelMetadataProvider.cs
@@ -40,11 +40,11 @@ private void NormalizeMetadataDetail(DefaultMetadataDetails detail)
     {
         foreach (var validationAttribute in detail.ModelAttributes.Attributes.OfType<ValidationAttribute>())
         {
-            NormalizeValidationAttrbute(validationAttribute);
+            NormalizeValidationAttribute(validationAttribute);
         }
     }
 
-    protected virtual void NormalizeValidationAttrbute(ValidationAttribute validationAttribute)
+    protected virtual void NormalizeValidationAttribute(ValidationAttribute validationAttribute)
     {
         if (validationAttribute.ErrorMessage == null)
         {

diff --git a/...c/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Validation/ValidationAttributeHelper.cs b/...c/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Validation/ValidationAttributeHelper.cs
@@ -1,14 +1,15 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 
 namespace Volo.Abp.AspNetCore.Mvc.Validation;
 
 public static class ValidationAttributeHelper
 {
-    private static readonly PropertyInfo ValidationAttributeErrorMessageStringProperty = typeof(ValidationAttribute)
+    private readonly static PropertyInfo ValidationAttributeErrorMessageStringProperty = typeof(ValidationAttribute)
         .GetProperty("ErrorMessageString", BindingFlags.Instance | BindingFlags.NonPublic)!;
 
-    private static readonly PropertyInfo ValidationAttributeCustomErrorMessageSetProperty = typeof(ValidationAttribute)
+    private readonly static PropertyInfo ValidationAttributeCustomErrorMessageSetProperty = typeof(ValidationAttribute)
         .GetProperty("CustomErrorMessageSet", BindingFlags.Instance | BindingFlags.NonPublic)!;
 
     public static void SetDefaultErrorMessage(ValidationAttribute validationAttribute)
@@ -24,7 +25,14 @@ public static void SetDefaultErrorMessage(ValidationAttribute validationAttribut
             }
         }
 
-        validationAttribute.ErrorMessage =
-            ValidationAttributeErrorMessageStringProperty.GetValue(validationAttribute) as string;
+        try
+        {
+            var errorMessageString = ValidationAttributeErrorMessageStringProperty.GetValue(validationAttribute) as string;
+            validationAttribute.ErrorMessage = errorMessageString;
+        }
+        catch (Exception e)
+        {
+            // ignored
+        }
     }
 }