Add unit test for HTTP3 trailing headers. (#73460)

dotnet · Aug 8, 2022 · 4734ee0 · 4734ee0
1 parent 4659614
commit 4734ee0
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 12 deletions.
diff --git a/src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs b/src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs
@@ -75,18 +75,21 @@ public async Task SendSettingsFrameAsync(ICollection<(long settingId, long setti
             await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
         }
 
-        private Memory<byte> ConstructHeadersPayload(HttpStatusCode statusCode, IEnumerable<HttpHeaderData> headers, bool qpackEncodeStatus = false)
+        private Memory<byte> ConstructHeadersPayload(HttpStatusCode? statusCode, IEnumerable<HttpHeaderData> headers, bool qpackEncodeStatus = false)
         {
             int bufferLength = QPackTestEncoder.MaxPrefixLength;
 
-            if (qpackEncodeStatus)
+            if (statusCode.HasValue)
             {
-                bufferLength += QPackTestEncoder.MaxVarIntLength * 2 + ":status".Length + 3;
+                if (qpackEncodeStatus)
+                {
+                    bufferLength += QPackTestEncoder.MaxVarIntLength * 2 + ":status".Length + 3;
+                }
+                else
+                {
+                    headers = headers.Prepend(new HttpHeaderData(":status", ((int)statusCode.Value).ToString(CultureInfo.InvariantCulture)));
+                };
             }
-            else
-            {
-                headers = headers.Prepend(new HttpHeaderData(":status", ((int)statusCode).ToString(CultureInfo.InvariantCulture)));
-            };
 
             foreach (HttpHeaderData header in headers)
             {
@@ -102,9 +105,9 @@ private Memory<byte> ConstructHeadersPayload(HttpStatusCode statusCode, IEnumera
 
             bytesWritten += QPackTestEncoder.EncodePrefix(buffer.AsSpan(bytesWritten), 0, 0);
 
-            if (qpackEncodeStatus)
+            if (statusCode.HasValue && qpackEncodeStatus)
             {
-                bytesWritten += QPackTestEncoder.EncodeStatusCode((int)statusCode, buffer.AsSpan(bytesWritten));
+                bytesWritten += QPackTestEncoder.EncodeStatusCode((int)statusCode.Value, buffer.AsSpan(bytesWritten));
             }
 
             foreach (HttpHeaderData header in headers)
@@ -115,12 +118,12 @@ private Memory<byte> ConstructHeadersPayload(HttpStatusCode statusCode, IEnumera
             return buffer.AsMemory(0, bytesWritten);
         }
 
-        private async Task SendHeadersFrameAsync(HttpStatusCode statusCode, IEnumerable<HttpHeaderData> headers, bool qpackEncodeStatus = false)
+        private async Task SendHeadersFrameAsync(HttpStatusCode? statusCode, IEnumerable<HttpHeaderData> headers, bool qpackEncodeStatus = false)
         {
             await SendFrameAsync(HeadersFrame, ConstructHeadersPayload(statusCode, headers, qpackEncodeStatus)).ConfigureAwait(false);
         }
 
-        private async Task SendPartialHeadersFrameAsync(HttpStatusCode statusCode, IEnumerable<HttpHeaderData> headers)
+        private async Task SendPartialHeadersFrameAsync(HttpStatusCode? statusCode, IEnumerable<HttpHeaderData> headers)
         {
             Memory<byte> payload = ConstructHeadersPayload(statusCode, headers);
 
@@ -255,7 +258,7 @@ private IEnumerable<HttpHeaderData> PrepareHeaders(IEnumerable<HttpHeaderData> h
             return headers;
         }
 
-        public async Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IEnumerable<HttpHeaderData> headers = null)
+        public async Task SendResponseHeadersAsync(HttpStatusCode? statusCode = HttpStatusCode.OK, IEnumerable<HttpHeaderData> headers = null)
         {
             headers = PrepareHeaders(headers);
             await SendHeadersFrameAsync(statusCode, headers).ConfigureAwait(false);

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
@@ -1557,6 +1557,45 @@ public async Task DuplexStreaming_AbortByServer_StreamingCancelled(bool graceful
             await connection.DisposeAsync();
         }
 
+        [Fact]
+        public async Task ServerSendsTrailingHeaders_Success()
+        {
+            using Http3LoopbackServer server = CreateHttp3LoopbackServer();
+
+            Task serverTask = Task.Run(async () =>
+            {
+                await using Http3LoopbackConnection connection = (Http3LoopbackConnection)await server.EstablishGenericConnectionAsync();
+
+                await using Http3LoopbackStream requestStream = await connection.AcceptRequestStreamAsync();
+
+                await requestStream.ReadRequestDataAsync();
+                await requestStream.SendResponseAsync(isFinal: false);
+                await requestStream.SendResponseHeadersAsync(null, new[] { new HttpHeaderData("MyHeader", "MyValue") });
+            });
+
+            Task clientTask = Task.Run(async () =>
+            {
+                using HttpClient client = CreateHttpClient();
+
+                using HttpRequestMessage request = new()
+                {
+                    Method = HttpMethod.Get,
+                    RequestUri = server.Address,
+                    Version = HttpVersion30,
+                    VersionPolicy = HttpVersionPolicy.RequestVersionExact
+                };
+
+                using HttpResponseMessage response = await client.SendAsync(request);
+
+                (string key, IEnumerable<string> value) = Assert.Single(response.TrailingHeaders);
+                Assert.Equal("MyHeader", key);
+                Assert.Equal("MyValue", Assert.Single(value));
+            });
+
+            await new[] { clientTask, serverTask }.WhenAllOrAnyFailed(200_000);
+
+        }
+
         private static async Task<QuicException> AssertThrowsQuicExceptionAsync(QuicError expectedError, Func<Task> testCode)
         {
             QuicException ex = await Assert.ThrowsAsync<QuicException>(testCode);