Merge pull request #63 from davidp1978/62-null-key-in-form-data

Fix exception with null key in form data

Author: tsimbalar

src/SerilogWeb.Classic/Classic/SerilogWebClassicConfiguration.cs

@@ -89,7 +89,17 @@ internal SerilogWebClassicConfiguration Edit(Func<SerilogWebClassicConfiguration
         /// <param name="value">Value of the pair</param>
         internal string FilterPasswords(string key, string value)
         {
-            if (FilterPasswordsInFormData && FilteredKeywordsInFormData.Any(keyword => key.IndexOf(keyword, StringComparison.OrdinalIgnoreCase) != -1))
+            if (!FilterPasswordsInFormData)
+            {
+                return value;
+            }
+
+            if (key == null)
+            {
+                return value;
+            }
+
+            if (FilteredKeywordsInFormData.Any(keyword => key.IndexOf(keyword, StringComparison.OrdinalIgnoreCase) != -1))
             {
                 return "********";
             }

test/SerilogWeb.Classic.Tests/WebRequestLoggingHandlerTests.cs

@@ -363,6 +363,32 @@ public void PasswordBlackListCanBeCustomized()
             Assert.Equal(expectedLoggedData.ToString(), formDataProperty.ToString());
         }
 
+        [Fact]
+        public void LogPostedFormDataHandlesNullKeyWhenFiltered()
+        {
+            var formData = new NameValueCollection
+            {
+                {"Foo","Bar" },
+                {"Qux", "Baz" },
+                {null, "" }
+            };
+
+            SerilogWebClassic.Configure(cfg => cfg
+                .EnableFormDataLogging(forms => forms
+                    .FilterKeywords(new List<string>
+                        {
+                            "NA"
+                        }))
+            );
+
+            TestContext.SimulateForm(formData);
+
+            var formDataProperty = LastEvent.Properties["FormData"];
+            Assert.NotNull(formDataProperty);
+            var expected = formData.ToSerilogNameValuePropertySequence();
+            Assert.Equal(expected.ToString(), formDataProperty.ToString());
+        }
+
         [Fact]
         public void EnableDisable()
         {