Ensure status code is 400 if MessageBody.Consume() throws when consuming the rest of the request body.

Author: Cesar Blum Silveira

src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameOfT.cs

@@ -115,25 +115,29 @@ public override async Task RequestProcessingAsync()
                                 await FireOnCompleted();
                             }
 
-                            // If _requestAbort is set, the connection has already been closed.
-                            if (Volatile.Read(ref _requestAborted) == 0)
+                            try
                             {
-                                ResumeStreams();
-
-                                if (_keepAlive)
+                                // If _requestAbort is set, the connection has already been closed.
+                                if (Volatile.Read(ref _requestAborted) == 0)
                                 {
-                                    // Finish reading the request body in case the app did not.
-                                    await messageBody.Consume();
+                                    ResumeStreams();
+
+                                    if (_keepAlive)
+                                    {
+                                        // Finish reading the request body in case the app did not.
+                                        await messageBody.Consume();
+                                    }
                                 }
 
+                                // ProduceEnd() must be called before _application.DisposeContext(), to ensure
+                                // HttpContext.Response.StatusCode is correctly set when
+                                // IHttpContextFactory.Dispose(HttpContext) is called.
+                                await ProduceEnd();
+                            }
+                            finally
+                            {
+                                _application.DisposeContext(context, _applicationException);
                             }
-
-                            // ProduceEnd() must be called before _application.DisposeContext(), to ensure
-                            // HttpContext.Response.StatusCode is correctly set when
-                            // IHttpContextFactory.Dispose(HttpContext) is called.
-                            await ProduceEnd();
-
-                            _application.DisposeContext(context, _applicationException);
                         }
 
                         StopStreams();

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
@@ -223,8 +224,24 @@ public Task ResponseStatusCodeSetBeforeHttpContextDisposeRequestAbortedAppExcept
                 expectedServerStatusCode: HttpStatusCode.InternalServerError);
         }
 
-        private static async Task ResponseStatusCodeSetBeforeHttpContextDispose(RequestDelegate handler,
-            HttpStatusCode? expectedClientStatusCode, HttpStatusCode expectedServerStatusCode)
+        [Fact]
+        public Task ResponseStatusCodeSetBeforeHttpContextDisposedRequestMalformed()
+        {
+            return ResponseStatusCodeSetBeforeHttpContextDispose(
+                context =>
+                {
+                    return TaskCache.CompletedTask;
+                },
+                expectedClientStatusCode: null,
+                expectedServerStatusCode: HttpStatusCode.BadRequest,
+                sendMalformedRequest: true);
+        }
+
+        private static async Task ResponseStatusCodeSetBeforeHttpContextDispose(
+            RequestDelegate handler,
+            HttpStatusCode? expectedClientStatusCode,
+            HttpStatusCode expectedServerStatusCode,
+            bool sendMalformedRequest = false)
         {
             var mockHttpContextFactory = new Mock<IHttpContextFactory>();
             mockHttpContextFactory.Setup(f => f.Create(It.IsAny<IFeatureCollection>()))
@@ -250,24 +267,38 @@ private static async Task ResponseStatusCodeSetBeforeHttpContextDispose(RequestD
             {
                 host.Start();
 
-                using (var client = new HttpClient())
+                if (!sendMalformedRequest)
                 {
-                    try
-                    {
-                        var response = await client.GetAsync($"http://localhost:{host.GetPort()}/");
-                        Assert.Equal(expectedClientStatusCode, response.StatusCode);
-                    }
-                    catch
+                    using (var client = new HttpClient())
                     {
-                        if (expectedClientStatusCode != null)
+                        try
+                        {
+                            var response = await client.GetAsync($"http://localhost:{host.GetPort()}/");
+                            Assert.Equal(expectedClientStatusCode, response.StatusCode);
+                        }
+                        catch
                         {
-                            throw;
+                            if (expectedClientStatusCode != null)
+                            {
+                                throw;
+                            }
                         }
                     }
                 }
+                else
+                {
+                    using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                    {
+                        socket.Connect(new IPEndPoint(IPAddress.Loopback, host.GetPort()));
+                        socket.Send(Encoding.ASCII.GetBytes(
+                            "POST / HTTP/1.1\r\n" +
+                            "Transfer-Encoding: chunked\r\n" +
+                            "\r\n" +
+                            "wrong"));
+                    }
+                }
 
                 var disposedStatusCode = await disposedTcs.Task.TimeoutAfter(TimeSpan.FromSeconds(10));
-
                 Assert.Equal(expectedServerStatusCode, (HttpStatusCode)disposedStatusCode);
             }
         }