[NoMerge] For davidfowl

src/Microsoft.AspNetCore.Server.Kestrel/BadHttpRequestException.cs

@@ -43,6 +43,9 @@ internal static BadHttpRequestException GetException(RequestRejectionReason reas
                 case RequestRejectionReason.MalformedRequestInvalidHeaders:
                     ex = new BadHttpRequestException("Malformed request: invalid headers.", StatusCodes.Status400BadRequest);
                     break;
+                case RequestRejectionReason.MultipleContentLengths:
+                    ex = new BadHttpRequestException("Multiple Content-Length headers.", StatusCodes.Status400BadRequest);
+                    break;
                 case RequestRejectionReason.UnexpectedEndOfRequestContent:
                     ex = new BadHttpRequestException("Unexpected end of request content.", StatusCodes.Status400BadRequest);
                     break;

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

@@ -41,7 +41,6 @@ public abstract partial class Frame : IFrameControl
         private static readonly byte[] _bytesConnectionKeepAlive = Encoding.ASCII.GetBytes("\r\nConnection: keep-alive");
         private static readonly byte[] _bytesTransferEncodingChunked = Encoding.ASCII.GetBytes("\r\nTransfer-Encoding: chunked");
         private static readonly byte[] _bytesHttpVersion11 = Encoding.ASCII.GetBytes("HTTP/1.1 ");
-        private static readonly byte[] _bytesContentLengthZero = Encoding.ASCII.GetBytes("\r\nContent-Length: 0");
         private static readonly byte[] _bytesEndHeaders = Encoding.ASCII.GetBytes("\r\n\r\n");
         private static readonly byte[] _bytesServer = Encoding.ASCII.GetBytes("\r\nServer: Kestrel");
 
@@ -657,12 +656,12 @@ private void VerifyAndUpdateWrite(int count)
 
             if (responseHeaders != null &&
                 !responseHeaders.HasTransferEncoding &&
-                responseHeaders.HasContentLength &&
-                _responseBytesWritten + count > responseHeaders.HeaderContentLengthValue.Value)
+                responseHeaders.ContentLength.HasValue &&
+                _responseBytesWritten + count > responseHeaders.ContentLength.Value)
             {
                 _keepAlive = false;
                 throw new InvalidOperationException(
-                    $"Response Content-Length mismatch: too many bytes written ({_responseBytesWritten + count} of {responseHeaders.HeaderContentLengthValue.Value}).");
+                    $"Response Content-Length mismatch: too many bytes written ({_responseBytesWritten + count} of {responseHeaders.ContentLength.Value}).");
             }
 
             _responseBytesWritten += count;
@@ -679,8 +678,8 @@ private void CheckLastWrite()
             // Called after VerifyAndUpdateWrite(), so _responseBytesWritten has already been updated.
             if (responseHeaders != null &&
                 !responseHeaders.HasTransferEncoding &&
-                responseHeaders.HasContentLength &&
-                _responseBytesWritten == responseHeaders.HeaderContentLengthValue.Value)
+                responseHeaders.ContentLength.HasValue &&
+                _responseBytesWritten == responseHeaders.ContentLength.Value)
             {
                 _abortedCts = null;
             }
@@ -692,8 +691,8 @@ protected void VerifyResponseContentLength()
 
             if (!HttpMethods.IsHead(Method) &&
                 !responseHeaders.HasTransferEncoding &&
-                responseHeaders.HeaderContentLengthValue.HasValue &&
-                _responseBytesWritten < responseHeaders.HeaderContentLengthValue.Value)
+                responseHeaders.ContentLength.HasValue &&
+                _responseBytesWritten < responseHeaders.ContentLength.Value)
             {
                 // We need to close the connection if any bytes were written since the client
                 // cannot be certain of how many bytes it will receive.
@@ -703,7 +702,7 @@ protected void VerifyResponseContentLength()
                 }
 
                 ReportApplicationError(new InvalidOperationException(
-                    $"Response Content-Length mismatch: too few bytes written ({_responseBytesWritten} of {responseHeaders.HeaderContentLengthValue.Value})."));
+                    $"Response Content-Length mismatch: too few bytes written ({_responseBytesWritten} of {responseHeaders.ContentLength.Value})."));
             }
         }
 
@@ -920,13 +919,13 @@ private void CreateResponseHeader(
             // automatically for HEAD requests or 204, 205, 304 responses.
             if (_canHaveBody)
             {
-                if (!hasTransferEncoding && !responseHeaders.HasContentLength)
+                if (!hasTransferEncoding && !responseHeaders.ContentLength.HasValue)
                 {
                     if (appCompleted && StatusCode != StatusCodes.Status101SwitchingProtocols)
                     {
                         // Since the app has completed and we are only now generating
                         // the headers we can safely set the Content-Length to 0.
-                        responseHeaders.SetRawContentLength("0", _bytesContentLengthZero);
+                        responseHeaders.ContentLength = 0;
                     }
                     else
                     {
@@ -1258,9 +1257,9 @@ private bool RequestUrlStartsWithPathBase(string requestUrl, out bool caseMatche
 
         public bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders requestHeaders)
         {
-            var scan = input.ConsumingStart();
-            var consumed = scan;
-            var end = scan;
+            var end = input.ConsumingStart();
+            var consumed = end;
+            var remainingBytesAllowed = _remainingRequestHeadersBytesAllowed;
             try
             {
                 while (!end.IsEnd)
@@ -1303,9 +1302,9 @@ public bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders requestHea
                     }
 
                     int bytesScanned;
-                    if (end.Seek(ByteLF, out bytesScanned, _remainingRequestHeadersBytesAllowed) == -1)
+                    if (end.Seek(ByteCR, out bytesScanned, remainingBytesAllowed) == -1)
                     {
-                        if (bytesScanned >= _remainingRequestHeadersBytesAllowed)
+                        if (bytesScanned >= remainingBytesAllowed)
                         {
                             RejectRequest(RequestRejectionReason.HeadersExceedMaxTotalSize);
                         }
@@ -1315,51 +1314,35 @@ public bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders requestHea
                         }
                     }
 
-                    var beginName = scan;
-                    if (scan.Seek(ByteColon, ref end) == -1)
-                    {
-                        RejectRequest(RequestRejectionReason.NoColonCharacterFoundInHeaderLine);
-                    }
-                    var endName = scan;
-
-                    scan.Take();
-
-                    var validateName = beginName;
-                    if (validateName.Seek(ByteSpace, ByteTab, ref endName) != -1)
-                    {
-                        RejectRequest(RequestRejectionReason.WhitespaceIsNotAllowedInHeaderName);
-                    }
-
-                    var beginValue = scan;
-                    ch = scan.Take();
-
-                    while (ch == ByteSpace || ch == ByteTab)
+                    var validate = end;
+                    validate.Take();
+                    ch = validate.Peek();
+                    if (ch == -1)
                     {
-                        beginValue = scan;
-                        ch = scan.Take();
+                        end = validate;
+                        return false;
                     }
-
-                    scan = beginValue;
-                    if (scan.Seek(ByteCR, ref end) == -1)
+                    else if (ch == ByteLF && bytesScanned + 1 > remainingBytesAllowed)
                     {
-                        RejectRequest(RequestRejectionReason.MissingCRInHeaderLine);
+                        end = validate;
+                        RejectRequest(RequestRejectionReason.HeadersExceedMaxTotalSize);
                     }
-
-                    scan.Take(); // we know this is '\r'
-                    ch = scan.Take(); // expecting '\n'
-                    end = scan;
-
-                    if (ch != ByteLF)
+                    else if (ch != ByteLF)
                     {
                         RejectRequest(RequestRejectionReason.HeaderValueMustNotContainCR);
                     }
 
-                    var next = scan.Peek();
-                    if (next == -1)
+                    bytesScanned++;
+                    remainingBytesAllowed -= bytesScanned;
+
+                    validate.Take();
+                    ch = validate.Peek();
+                    if (ch == -1)
                     {
+                        end = validate;
                         return false;
                     }
-                    else if (next == ByteSpace || next == ByteTab)
+                    else if (ch == ByteSpace || ch == ByteTab)
                     {
                         // From https://tools.ietf.org/html/rfc7230#section-3.2.4:
                         //
@@ -1381,34 +1364,66 @@ public bool TakeMessageHeaders(SocketInput input, FrameRequestHeaders requestHea
                         RejectRequest(RequestRejectionReason.HeaderValueLineFoldingNotSupported);
                     }
 
+                    var scan = consumed;
+                    if (scan.Seek(ByteColon, ref end) == -1)
+                    {
+                        RejectRequest(RequestRejectionReason.NoColonCharacterFoundInHeaderLine);
+                    }
+
+                    validate = consumed;
+                    if (validate.Seek(ByteSpace, ByteTab, ByteLF, ref scan) != -1)
+                    {
+                        if (validate.Peek() == ByteLF)
+                        {
+                            RejectRequest(RequestRejectionReason.MissingCRInHeaderLine);
+                        }
+                        RejectRequest(RequestRejectionReason.WhitespaceIsNotAllowedInHeaderName);
+                    }
+
+                    var name = consumed.GetArraySegment(validate);
+                    scan.Take();
+
+                    ch = scan.Peek();
+
+                    // Skip starting whitespace
+                    while (ch == ByteSpace || ch == ByteTab)
+                    {
+                        scan.Take();
+                        ch = scan.Peek();
+                    }
+
                     // Trim trailing whitespace from header value by repeatedly advancing to next
                     // whitespace or CR.
                     //
                     // - If CR is found, this is the end of the header value.
                     // - If whitespace is found, this is the _tentative_ end of the header value.
                     //   If non-whitespace is found after it and it's not CR, seek again to the next
                     //   whitespace or CR for a new (possibly tentative) end of value.
-                    var ws = beginValue;
-                    var endValue = scan;
+
+                    validate = end;
+                    consumed = scan;
                     do
                     {
-                        ws.Seek(ByteSpace, ByteTab, ByteCR);
-                        endValue = ws;
+                        consumed.Seek(ByteSpace, ByteTab, ByteCR);
+                        validate = consumed;
 
-                        ch = ws.Take();
+                        ch = consumed.Peek();
                         while (ch == ByteSpace || ch == ByteTab)
                         {
-                            ch = ws.Take();
+                            consumed.Take();
+                            ch = consumed.Peek();
                         }
                     } while (ch != ByteCR);
 
-                    var name = beginName.GetArraySegment(endName);
-                    var value = beginValue.GetAsciiString(ref endValue);
+                    var value = scan.GetAsciiString(ref validate);
+
+                    end.Take(); // CR
+                    end.Take(); // LF
+                    consumed = end;
 
-                    consumed = scan;
                     requestHeaders.Append(name.Array, name.Offset, name.Count, value);
 
-                    _remainingRequestHeadersBytesAllowed -= bytesScanned;
+                    _remainingRequestHeadersBytesAllowed = remainingBytesAllowed;
                     _requestHeadersParsed++;
                 }
 
@@ -1468,7 +1483,7 @@ private void SetErrorResponseHeaders(int statusCode)
             var dateHeaderValues = DateHeaderValueManager.GetDateHeaderValues();
 
             responseHeaders.SetRawDate(dateHeaderValues.String, dateHeaderValues.Bytes);
-            responseHeaders.SetRawContentLength("0", _bytesContentLengthZero);
+            responseHeaders.ContentLength = 0;
 
             if (ServerOptions.AddServerHeader)
             {