Test cleanup

Author: Tratcher

src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs

@@ -16,8 +16,8 @@ namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests
 {
     public class Http2Tests
     {
-        [ConditionalFact]
-        // TODO: Max OS Version attribute
+        [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore/issues/17420")]
+        // TODO: Max OS Version attribute 19H1
         [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Http2 requires Win10")]
         public async Task ConnectionClose_NoOSSupport_NoGoAway()
         {
@@ -86,7 +86,7 @@ public async Task ConnectionClose_NoOSSupport_NoGoAway()
         }
 
         [ConditionalFact]
-        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_19H2, SkipReason = "Http2 requires Win10")]
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_19H2, SkipReason = "GoAway support was added in Win10_19H2.")]
         public async Task ConnectionClose_OSSupport_SendsGoAway()
         {
             using var server = Utilities.CreateDynamicHttpsServer(out var address, httpContext =>
@@ -115,8 +115,7 @@ public async Task ConnectionClose_OSSupport_SendsGoAway()
                             var headersFrame = await http2Utilities.ReceiveFrameAsync();
 
                             Assert.Equal(Http2FrameType.HEADERS, headersFrame.Type);
-                            Assert.True((headersFrame.Flags & (byte)Http2HeadersFrameFlags.END_HEADERS) != 0);
-                            Assert.True((headersFrame.Flags & (byte)Http2HeadersFrameFlags.END_STREAM) != 0);
+                            Assert.Equal(Http2HeadersFrameFlags.END_HEADERS, headersFrame.HeadersFlags);
 
                             logger.LogInformation("Received headers in a single frame.");
 
@@ -126,7 +125,26 @@ public async Task ConnectionClose_OSSupport_SendsGoAway()
                             Assert.False(decodedHeaders.ContainsKey(HeaderNames.Connection));
                             Assert.Equal("200", decodedHeaders[HeaderNames.Status]);
 
-                            await http2Utilities.StopConnectionAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false);
+                            var dataFrame = await http2Utilities.ReceiveFrameAsync();
+                            Assert.Equal(Http2FrameType.DATA, dataFrame.Type);
+                            Assert.Equal(Http2DataFrameFlags.END_STREAM, dataFrame.DataFlags);
+                            Assert.Equal(0, dataFrame.PayloadLength);
+
+                            // TODO: Why doesn't HttpSys send a final GoAway or close the connection?
+                            // https://tools.ietf.org/html/rfc7540#section-6.8
+                            // A server that is attempting to gracefully shut down a
+                            // connection SHOULD send an initial GOAWAY frame with the last stream
+                            // identifier set to 2^31-1 and a NO_ERROR code.  This signals to the
+                            // client that a shutdown is imminent and that initiating further
+                            // requests is prohibited.  After allowing time for any in-flight stream
+                            // creation (at least one round-trip time), the server can send another
+                            // GOAWAY frame with an updated last stream identifier.  This ensures
+                            // that a connection can be cleanly shut down without losing requests.
+                            //
+                            // await http2Utilities.StopConnectionAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false);
+                            // or
+                            // await http2Utilities.SendGoAwayAsync();
+                            // await http2Utilities.WaitForConnectionStopAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false);
 
                             logger.LogInformation("Connection stopped.");
                         };

src/Shared/Http2cat/Http2CatHostedService.cs

@@ -53,6 +53,7 @@ public async Task RunAsync()
             _logger.LogInformation($"Connected to '{endpoint}'.");
 
             var originalTransport = context.Transport;
+            IAsyncDisposable sslState = null;
             if (address.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
             {
                 _logger.LogInformation("Starting TLS handshake.");
@@ -63,6 +64,7 @@ public async Task RunAsync()
 
                 var sslDuplexPipe = new SslDuplexPipe(context.Transport, inputPipeOptions, outputPipeOptions);
                 var sslStream = sslDuplexPipe.Stream;
+                sslState = sslDuplexPipe;
 
                 context.Transport = sslDuplexPipe;
 
@@ -92,6 +94,11 @@ await sslStream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions
             {
                 // Unwind Https for shutdown. This must happen before context goes ot of scope or else DisposeAsync will hang
                 context.Transport = originalTransport;
+
+                if (sslState != null)
+                {
+                    await sslState.DisposeAsync();
+                }
             }
         }
     }