Add extra contentlength tests

Author: benaadams

src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.Generated.cs

@@ -9839,7 +9839,7 @@ protected void CopyToFast(ref MemoryPoolIterator output)
                 if (ContentLength.HasValue)
                 {
                     output.CopyFrom(_headerBytes, 592, 18);
-                    output.CopyFromNumeric(ContentLength.Value);
+                    output.CopyFromNumeric((ulong)ContentLength.Value);
 
                     tempBits &= ~-9223372036854775808L;
                     if(tempBits == 0)

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

@@ -13,11 +13,22 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http
 {
     public abstract class FrameHeaders : IHeaderDictionary
     {
+        private long? _contentLength;
         protected bool _isReadOnly;
         protected Dictionary<string, StringValues> MaybeUnknown;
         protected Dictionary<string, StringValues> Unknown => MaybeUnknown ?? (MaybeUnknown = new Dictionary<string, StringValues>(StringComparer.OrdinalIgnoreCase));
 
-        public long? ContentLength { get; set; }
+        public long? ContentLength {
+            get { return _contentLength; }
+            set
+            {
+                if (value.HasValue && value.Value < 0)
+                {
+                    ThrowInvalidResponseContentLengthException(value.Value);
+                }
+                _contentLength = value;
+            }
+        }
 
         StringValues IHeaderDictionary.this[string key]
         {
@@ -424,6 +435,11 @@ public static unsafe TransferCoding GetFinalTransferCoding(StringValues transfer
             return transferEncodingOptions;
         }
 
+        protected static void ThrowInvalidResponseContentLengthException(long value)
+        {
+            throw new ArgumentOutOfRangeException($"Invalid Content-Length: \"{value}\". Value must be a positive integral number.");
+        }
+
         protected static void ThrowInvalidResponseContentLengthException(string value)
         {
             throw new InvalidOperationException($"Invalid Content-Length: \"{value}\". Value must be a positive integral number.");

src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolIterator.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
 {
     public struct MemoryPoolIterator
     {
-        private const int _maxPositiveLongByteLength = 19;
+        private const int _maxULongByteLength = 20;
         private const ulong _xorPowerOfTwoToHighByte = (0x07ul       |
                                                         0x06ul <<  8 |
                                                         0x05ul << 16 |
@@ -1091,12 +1091,14 @@ public unsafe void CopyFromAscii(string data)
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static byte[] CreateNumericBytesScratch()
         {
-            return (_numericBytesScratch = new byte[_maxPositiveLongByteLength]);
+            var bytes = new byte[_maxULongByteLength];
+            _numericBytesScratch = bytes;
+            return bytes;
         }
 
-        public void CopyFromNumeric(long value)
+        public void CopyFromNumeric(ulong value)
         {
-            var position = _maxPositiveLongByteLength;
+            var position = _maxULongByteLength;
             var byteBuffer = NumericBytesScratch;
             do
             {
@@ -1107,7 +1109,7 @@ public void CopyFromNumeric(long value)
             }
             while (value != 0);
 
-            CopyFrom(byteBuffer, position, _maxPositiveLongByteLength - position);
+            CopyFrom(byteBuffer, position, _maxULongByteLength - position);
         }
 
         public unsafe string GetAsciiString(ref MemoryPoolIterator end)

test/Microsoft.AspNetCore.Server.KestrelTests/FrameHeadersTests.cs

@@ -1,8 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Server.Kestrel.Internal.Http;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.KestrelTests
@@ -223,5 +226,65 @@ public void TestParseTransferEncodingMultipleValues(string value1, string value2
             var transferEncodingOptions = FrameHeaders.GetFinalTransferCoding(transferEncoding);
             Assert.Equal(expectedTransferEncodingOptions, transferEncodingOptions);
         }
+
+        [Fact]
+        public void ValidContentLengthsAccepted()
+        {
+            ValidContentLengthsAccepted(new FrameRequestHeaders());
+            ValidContentLengthsAccepted(new FrameResponseHeaders());
+        }
+
+        private static void ValidContentLengthsAccepted(FrameHeaders frameHeaders)
+        {
+            IDictionary<string, StringValues> headers = frameHeaders;
+
+            StringValues value;
+
+            Assert.False(headers.TryGetValue("Content-Length", out value));
+            Assert.Equal(null, frameHeaders.ContentLength);
+            Assert.False(frameHeaders.ContentLength.HasValue);
+
+            frameHeaders.ContentLength = 1;
+            Assert.True(headers.TryGetValue("Content-Length", out value));
+            Assert.Equal("1", value[0]);
+            Assert.Equal(1, frameHeaders.ContentLength);
+            Assert.True(frameHeaders.ContentLength.HasValue);
+
+            frameHeaders.ContentLength = long.MaxValue;
+            Assert.True(headers.TryGetValue("Content-Length", out value));
+            Assert.Equal(HeaderUtilities.FormatInt64(long.MaxValue), value[0]);
+            Assert.Equal(long.MaxValue, frameHeaders.ContentLength);
+            Assert.True(frameHeaders.ContentLength.HasValue);
+
+            frameHeaders.ContentLength = null;
+            Assert.False(headers.TryGetValue("Content-Length", out value));
+            Assert.Equal(null, frameHeaders.ContentLength);
+            Assert.False(frameHeaders.ContentLength.HasValue);
+        }
+
+        [Fact]
+        public void InvalidContentLengthsRejected()
+        {
+            InvalidContentLengthsRejected(new FrameRequestHeaders());
+            InvalidContentLengthsRejected(new FrameResponseHeaders());
+        }
+
+        private static void InvalidContentLengthsRejected(FrameHeaders frameHeaders)
+        {
+            IDictionary<string, StringValues> headers = frameHeaders;
+
+            StringValues value;
+
+            Assert.False(headers.TryGetValue("Content-Length", out value));
+            Assert.Equal(null, frameHeaders.ContentLength);
+            Assert.False(frameHeaders.ContentLength.HasValue);
+
+            Assert.Throws<ArgumentOutOfRangeException>(() => frameHeaders.ContentLength = -1);
+            Assert.Throws<ArgumentOutOfRangeException>(() => frameHeaders.ContentLength = long.MinValue);
+
+            Assert.False(headers.TryGetValue("Content-Length", out value));
+            Assert.Equal(null, frameHeaders.ContentLength);
+            Assert.False(frameHeaders.ContentLength.HasValue);
+        }
     }
 }