Check that Content-Type is correct before accessing the Form (#322)

NLog · Oct 4, 2018 · 3ebb807 · 3ebb807
1 parent 7088c9f
commit 3ebb807
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/NLog.Web.AspNetCore.Tests/LayoutRenderers/AspNetRequestFormLayoutRendererTests.cs b/NLog.Web.AspNetCore.Tests/LayoutRenderers/AspNetRequestFormLayoutRendererTests.cs
@@ -18,6 +18,28 @@ namespace NLog.Web.Tests.LayoutRenderers
 {
     public class AspNetRequestFormLayoutRendererTests : TestInvolvingAspNetHttpContext
     {
+        [Fact]
+        public void ShouldReturnEmptyForNonValidContentTypes()
+        {
+            // Arrange
+            var expectedResult = "";
+#if ASP_NET_CORE
+            var httpContext = this.HttpContext;
+#else
+            var httpContext = Substitute.For<HttpContextBase>();
+#endif
+            var renderer = new AspNetRequestFormLayoutRenderer
+            {
+                HttpContextAccessor = new FakeHttpContextAccessor(httpContext)
+            };
+
+            // Act
+            string result = renderer.Render(new LogEventInfo());
+
+            // Assert
+            Assert.Equal(expectedResult, result);
+        }
+
         [Fact]
         public void ShouldReturnEmptyIfFormCollectionIsEmpty()
         {

diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestFormLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestFormLayoutRenderer.cs
@@ -77,7 +77,11 @@ private IEnumerable<KeyValuePair<string, string>> GetPairsToInclude()
             var httpRequest = HttpContextAccessor?.HttpContext?.TryGetRequest();
             var pairs = new List<KeyValuePair<string, string>>();
 
+#if ASP_NET_CORE
+            if (httpRequest.HasFormContentType && httpRequest.Form != null)
+#else
             if (httpRequest.Form != null)
+#endif
             {
                 foreach (string key in httpRequest.Form.Keys)
                 {