Feedback

Author: jkotalik

src/Servers/IIS/IIS/src/BadHttpRequestException.cs

@@ -4,7 +4,6 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNetCore.Server.IIS
 {
@@ -16,6 +15,7 @@ private BadHttpRequestException(string message, int statusCode, RequestRejection
             StatusCode = statusCode;
             Reason = reason;
         }
+
         public int StatusCode { get; }
 
         internal RequestRejectionReason Reason { get; }

src/Servers/IIS/IIS/src/Core/IISHttpContext.cs

@@ -292,12 +292,13 @@ private void InitializeRequestIO()
         {
             Debug.Assert(!HasStartedConsumingRequestBody);
 
-            HasStartedConsumingRequestBody = true;
             if (RequestHeaders.ContentLength > MaxRequestBodySize)
             {
                 BadHttpRequestException.Throw(RequestRejectionReason.RequestBodyTooLarge);
             }
 
+            HasStartedConsumingRequestBody = true;
+
             EnsureIOInitialized();
 
             _bodyInputPipe = new Pipe(new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.ThreadPool, minimumSegmentSize: MinAllocBufferSize));

src/Servers/IIS/IIS/src/Core/IISHttpContextOfT.cs

@@ -53,7 +53,7 @@ public override async Task<bool> ProcessRequestAsync()
             {
                 _streams.Stop();
 
-                if (!HasResponseStarted && _requestRejectedException == null && _applicationException == null && _onStarting != null)
+                if (!HasResponseStarted && _applicationException == null && _onStarting != null)
                 {
                     await FireOnStarting();
                     // Dispose

src/Servers/IIS/IIS/src/RequestRejectionReason.cs

@@ -5,34 +5,6 @@ namespace Microsoft.AspNetCore.Server.IIS
 {
     internal enum RequestRejectionReason
     {
-        UnrecognizedHTTPVersion,
-        InvalidRequestLine,
-        InvalidRequestHeader,
-        InvalidRequestHeadersNoCRLF,
-        MalformedRequestInvalidHeaders,
-        InvalidContentLength,
-        MultipleContentLengths,
-        UnexpectedEndOfRequestContent,
-        BadChunkSuffix,
-        BadChunkSizeData,
-        ChunkedRequestIncomplete,
-        InvalidRequestTarget,
-        InvalidCharactersInHeaderName,
-        RequestLineTooLong,
-        HeadersExceedMaxTotalSize,
-        TooManyHeaders,
-        RequestBodyTooLarge,
-        RequestHeadersTimeout,
-        RequestBodyTimeout,
-        FinalTransferCodingNotChunked,
-        LengthRequired,
-        LengthRequiredHttp10,
-        OptionsMethodRequired,
-        ConnectMethodRequired,
-        MissingHostHeader,
-        MultipleHostHeaders,
-        InvalidHostHeader,
-        UpgradeRequestCannotHavePayload,
-        RequestBodyExceedsContentLength
+        RequestBodyTooLarge
     }
 }

src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs

@@ -142,6 +142,57 @@ await connection.Send(
             }
         }
 
+        [ConditionalFact]
+        public async Task DoesNotRejectBodylessPostWithZeroContentLengthRequestWithZeroMaxRequestBodySize()
+        {
+            using (var testServer = await TestServer.Create(
+                async ctx =>
+                {
+                    await ctx.Request.Body.ReadAsync(new byte[2000]);
+
+                }, LoggerFactory, new IISServerOptions { MaxRequestBodySize = 0 }))
+            {
+                using (var connection = testServer.CreateConnection())
+                {
+                    await connection.Send(
+                        "POST / HTTP/1.1",
+                        $"Content-Length: 0",
+                        "Host: localhost",
+                        "",
+                        "");
+
+                    await connection.Receive("HTTP/1.1 200 OK");
+                }
+            }
+        }
+
+        [ConditionalFact]
+        public async Task DoesNotRejectBodylessPostWithEmptyChunksRequestWithZeroMaxRequestBodySize()
+        {
+            using (var testServer = await TestServer.Create(
+                async ctx =>
+                {
+                    await ctx.Request.Body.ReadAsync(new byte[2000]);
+
+                }, LoggerFactory, new IISServerOptions { MaxRequestBodySize = 0 }))
+            {
+                using (var connection = testServer.CreateConnection())
+                {
+                    await connection.Send(
+                        "POST / HTTP/1.1",
+                        $"Transfer-Encoding: chunked",
+                        "Host: localhost",
+                        "",
+                        "0",
+                        "",
+                        "");
+
+                    await connection.Receive("HTTP/1.1 200 OK");
+                }
+            }
+        }
+
+
         [ConditionalFact]
         public async Task SettingMaxRequestBodySizeAfterReadingFromRequestBodyThrows()
         {
@@ -240,7 +291,7 @@ public async Task EveryReadFailsWhenContentLengthHeaderExceedsGlobalLimit()
                 {
                     await connection.Send(
                         "POST / HTTP/1.1",
-                        "Host:",
+                        "Host: localhost",
                         "Content-Length: " + (new IISServerOptions().MaxRequestBodySize + 1),
                         "",
                         "");