Catch and log InvalidDataExceptions

Author: halter73

src/Http/Routing/src/Internal/MapActionExpressionTreeBuilder.cs

@@ -270,10 +270,16 @@ public static RequestDelegate BuildRequestDelegate(Delegate action)
                         }
                         catch (IOException ex)
                         {
-                            LogRequestBodyIOException(httpContext, ex);
+                            Log.RequestBodyIOException(GetLogger(httpContext), ex);
                             httpContext.Abort();
                             return;
                         }
+                        catch (InvalidDataException ex)
+                        {
+                            Log.RequestBodyInvalidDataException(GetLogger(httpContext), ex);
+                            httpContext.Response.StatusCode = 400;
+                            return;
+                        }
                     }
 
                     await invoker(target, httpContext, bodyValue);
@@ -294,10 +300,16 @@ public static RequestDelegate BuildRequestDelegate(Delegate action)
                     }
                     catch (IOException ex)
                     {
-                        LogRequestBodyIOException(httpContext, ex);
+                        Log.RequestBodyIOException(GetLogger(httpContext), ex);
                         httpContext.Abort();
                         return;
                     }
+                    catch (InvalidDataException ex)
+                    {
+                        Log.RequestBodyInvalidDataException(GetLogger(httpContext), ex);
+                        httpContext.Response.StatusCode = 400;
+                        return;
+                    }
 
                     await invoker(target, httpContext);
                 };
@@ -316,11 +328,10 @@ public static RequestDelegate BuildRequestDelegate(Delegate action)
             };
         }
 
-        private static void LogRequestBodyIOException(HttpContext httpContext, IOException exception)
+        private static ILogger GetLogger(HttpContext httpContext)
         {
             var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
-            var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Routing.MapAction");
-            Log.RequestBodyIOException(logger, exception);
+            return loggerFactory.CreateLogger("Microsoft.AspNetCore.Routing.MapAction");
         }
 
         private static Expression BindParamenter(Expression sourceExpression, ParameterInfo parameter, string? name)
@@ -433,10 +444,20 @@ private static class Log
                 new EventId(1, "RequestBodyIOException"),
                 "Reading the request body failed with an IOException.");
 
+            private static readonly Action<ILogger, Exception> _requestBodyInvalidDataException = LoggerMessage.Define(
+                LogLevel.Debug,
+                new EventId(2, "RequestBodyInvalidDataException"),
+                "Reading the request body failed with an InvalidDataException.");
+
             public static void RequestBodyIOException(ILogger logger, IOException exception)
             {
                 _requestBodyIOException(logger, exception);
             }
+
+            public static void RequestBodyInvalidDataException(ILogger logger, InvalidDataException exception)
+            {
+                _requestBodyInvalidDataException(logger, exception);
+            }
         }
     }
 }

src/Http/Routing/test/UnitTests/Internal/MapActionExpressionTreeBuilderTest.cs

@@ -252,7 +252,7 @@ void TestAction([FromBody(AllowEmpty = true)] BodyStruct bodyStruct)
         }
 
         [Fact]
-        public async Task RequestDelegateLogsFromBodyIOExceptionsAsDebug()
+        public async Task RequestDelegateLogsFromBodyIOExceptionsAsDebugAndAborts()
         {
             var invoked = false;
 
@@ -287,6 +287,43 @@ void TestAction([FromBody] Todo todo)
             Assert.Same(ioException, logMessage.Exception);
         }
 
+        [Fact]
+        public async Task RequestDelegateLogsFromBodyInvalidDataExceptionsAsDebugAndSets400Response()
+        {
+            var invoked = false;
+
+            var sink = new TestSink(context => context.LoggerName == "Microsoft.AspNetCore.Routing.MapAction");
+            var testLoggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            void TestAction([FromBody] Todo todo)
+            {
+                invoked = true;
+            }
+
+            var invalidDataException = new InvalidDataException();
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton<ILoggerFactory>(testLoggerFactory);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Headers["Content-Type"] = "application/json";
+            httpContext.Request.Body = new IOExceptionThrowingRequestBodyStream(invalidDataException);
+            httpContext.Features.Set<IHttpRequestLifetimeFeature>(new TestHttpRequestLifetimeFeature());
+            httpContext.RequestServices = serviceCollection.BuildServiceProvider();
+
+            var requestDelegate = MapActionExpressionTreeBuilder.BuildRequestDelegate((Action<Todo>)TestAction);
+
+            await requestDelegate(httpContext);
+
+            Assert.False(invoked);
+            Assert.False(httpContext.RequestAborted.IsCancellationRequested);
+            Assert.Equal(400, httpContext.Response.StatusCode);
+
+            var logMessage = Assert.Single(sink.Writes);
+            Assert.Equal(new EventId(2, "RequestBodyInvalidDataException"), logMessage.EventId);
+            Assert.Equal(LogLevel.Debug, logMessage.LogLevel);
+            Assert.Same(invalidDataException, logMessage.Exception);
+        }
+
         [Fact]
         public async Task RequestDelegatePopulatesFromFormParameterBasedOnParameterName()
         {
@@ -316,7 +353,7 @@ void TestAction([FromForm] int value)
         }
 
         [Fact]
-        public async Task RequestDelegateLogsFromFormIOExceptionsAsDebug()
+        public async Task RequestDelegateLogsFromFormIOExceptionsAsDebugAndAborts()
         {
             var invoked = false;
 
@@ -351,6 +388,43 @@ void TestAction([FromForm] int value)
             Assert.Same(ioException, logMessage.Exception);
         }
 
+        [Fact]
+        public async Task RequestDelegateLogsFromFormInvalidDataExceptionsAsDebugAndSets400Response()
+        {
+            var invoked = false;
+
+            var sink = new TestSink(context => context.LoggerName == "Microsoft.AspNetCore.Routing.MapAction");
+            var testLoggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            void TestAction([FromForm] int value)
+            {
+                invoked = true;
+            }
+
+            var invalidDataException = new InvalidDataException();
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton<ILoggerFactory>(testLoggerFactory);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Headers["Content-Type"] = "application/x-www-form-urlencoded";
+            httpContext.Request.Body = new IOExceptionThrowingRequestBodyStream(invalidDataException);
+            httpContext.Features.Set<IHttpRequestLifetimeFeature>(new TestHttpRequestLifetimeFeature());
+            httpContext.RequestServices = serviceCollection.BuildServiceProvider();
+
+            var requestDelegate = MapActionExpressionTreeBuilder.BuildRequestDelegate((Action<int>)TestAction);
+
+            await requestDelegate(httpContext);
+
+            Assert.False(invoked);
+            Assert.False(httpContext.RequestAborted.IsCancellationRequested);
+            Assert.Equal(400, httpContext.Response.StatusCode);
+
+            var logMessage = Assert.Single(sink.Writes);
+            Assert.Equal(new EventId(2, "RequestBodyInvalidDataException"), logMessage.EventId);
+            Assert.Equal(LogLevel.Debug, logMessage.LogLevel);
+            Assert.Same(invalidDataException, logMessage.Exception);
+        }
+
         [Fact]
         public void BuildRequestDelegateThrowsInvalidOperationExceptionGivenBothFromBodyAndFromFormOnDifferentParameters()
         {