Fix binder bug with key=value and array

NetLah · Jun 5, 2024 · af9a739 · af9a739
1 parent 8bdc630
commit af9a739
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/src/Hosting/ResponseHeadersHelper.cs b/src/Hosting/ResponseHeadersHelper.cs
@@ -13,7 +13,8 @@ internal static class ResponseHeadersHelper
         nameof(BaseResponseHeadersConfigurationOptions.ContentType),
         nameof(BaseResponseHeadersConfigurationOptions.ContentTypeContain),
         nameof(BaseResponseHeadersConfigurationOptions.ContentTypeStartWith),
-        nameof(BaseResponseHeadersConfigurationOptions.Headers),
+        // nameof(BaseResponseHeadersConfigurationOptions.Headers), binder cause bug between array and key value
+        "Headers",
         nameof(BaseResponseHeadersConfigurationOptions.StatusCode),
         nameof(ResponseHeadersConfigurationOptions.IsEnabled),
         "IsAnyContentType",             // legacy value
@@ -67,9 +68,14 @@ private static ResponseHandlerEntry ParseHandler(BaseResponseHeadersConfiguratio
     {
         var headers = new Dictionary<string, string>();
 
-        foreach (var item in options.Headers ?? [])
+        foreach (var item in configuration.GetSection("Headers").GetChildren())
         {
-            if (TryParseKeyValue(item, out var key, out var value)
+            if (item.Value is { } value1
+                && item.Key is { } key1
+                && !string.IsNullOrEmpty(key1)
+                && !string.IsNullOrEmpty(value1)
+                && int.TryParse(key1, out var _)
+                && TryParseKeyValue(value1, out var key, out var value)
                 && !string.IsNullOrEmpty(key)
                 && !string.IsNullOrEmpty(value))
             {
@@ -115,11 +121,15 @@ private static ResponseHandlerEntry ParseHandler(BaseResponseHeadersConfiguratio
                     headers[key] = value;
                 }
             }
-            else if (nameof(BaseResponseHeadersConfigurationOptions.Headers).Equals(key, DefaultStringComparison))
+            else if ("Headers".Equals(key, DefaultStringComparison))  // nameof(BaseResponseHeadersConfigurationOptions.Headers)
             {
                 foreach (var item1 in item.GetChildren())
                 {
-                    if (item1.Value is { } value1 && item1.Key is { } key1 && !string.IsNullOrEmpty(key1) && !string.IsNullOrEmpty(value1) && !int.TryParse(key1, out var _))
+                    if (item1.Value is { } value1
+                        && item1.Key is { } key1
+                        && !string.IsNullOrEmpty(key1)
+                        && !string.IsNullOrEmpty(value1)
+                        && !int.TryParse(key1, out var _))
                     {
                         headers[key1] = value1;
                     }

diff --git a/src/Hosting/ResponseHeadersOptions.cs b/src/Hosting/ResponseHeadersOptions.cs
@@ -8,7 +8,7 @@ internal class BaseResponseHeadersConfigurationOptions
     public HashSet<string>? ContentType { get; set; }
     public HashSet<string>? ContentTypeContain { get; set; }
     public HashSet<string>? ContentTypeStartWith { get; set; }
-    public List<string>? Headers { get; set; }
+    // public List<string>? Headers { get; set; } binder cause bug between array and key value
 }
 
 internal class ResponseHeadersConfigurationOptions : BaseResponseHeadersConfigurationOptions

diff --git a/test/Hosting.Test/ResponseHeadersHelperTest.cs b/test/Hosting.Test/ResponseHeadersHelperTest.cs
@@ -656,4 +656,31 @@ public void HeaderAllTest()
             ["x-header25"] = "value26",
         }, handler.Headers);
     }
+
+    [Fact]
+    public void HeaderKeyValueWithEqualTest()
+    {
+        var configuration = new ConfigurationManager();
+        configuration.AddInMemoryCollection(new Dictionary<string, string?>
+        {
+            ["ResponseHeaders:Headers:x-header28"] = "value29=hex",
+        });
+
+        var options = Parse(configuration, "ResponseHeaders");
+
+        Assert.NotNull(options);
+        Assert.NotNull(options.DefaultHandler);
+        Assert.Empty(options.Handlers);
+
+        var handler = options.DefaultHandler;
+        Assert.NotNull(handler);
+        Assert.Empty(handler.ContentTypeMatchEq);
+        Assert.Empty(handler.ContentTypeMatchContain);
+        Assert.Empty(handler.ContentTypeMatchStartWith);
+        Assert.Empty(handler.StatusCode);
+        Assert.Equal(new Dictionary<string, StringValues>
+        {
+            ["x-header28"] = "value29=hex",
+        }, handler.Headers);
+    }
 }