PR comments & smoke tests

Author: DeagleGross

src/Http/Http.Features/src/PublicAPI.Unshipped.txt

@@ -1,3 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Http.Features.IHttpSysRequestPropertyFeature
-Microsoft.AspNetCore.Http.Features.IHttpSysRequestPropertyFeature.TryGetTlsClientHello(System.Span<byte> tlsClientHelloBytesDestination, out int bytesReturned) -> bool

src/Http/Http.Features/src/IHttpSysRequestPropertyFeature.cs renamed to src/Servers/HttpSys/src/IHttpSysRequestPropertyFeature.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.AspNetCore.Http.Features;
+namespace Microsoft.AspNetCore.Server.HttpSys;
 
 /// <summary>
 /// Provides API to read HTTP_REQUEST_PROPERTY value from the HTTP.SYS request.
@@ -12,23 +12,25 @@ public interface IHttpSysRequestPropertyFeature
     /// <summary>
     /// Reads the TLS client hello from HTTP.SYS
     /// </summary>
-    /// <param name="tlsClientHelloBytesDestination">where raw bytes of tls client hello message will be written</param>
+    /// <param name="tlsClientHelloBytesDestination">Where the raw bytes of the TLS Client Hello message will be written.</param>
     /// <param name="bytesReturned">
     /// Returns the number of bytes written to <paramref name="tlsClientHelloBytesDestination"/>.
-    /// Or can return the size of buffer needed if <paramref name="tlsClientHelloBytesDestination"/> wasn't large enough.
+    /// Or can return the size of the buffer needed if <paramref name="tlsClientHelloBytesDestination"/> wasn't large enough.
     /// </param>
     /// <remarks>
     /// Works only if <c>HTTP_SERVICE_CONFIG_SSL_FLAG_ENABLE_CACHE_CLIENT_HELLO</c> flag is set on http.sys service configuration.
     /// See <see href="https://learn.microsoft.com/windows/win32/api/http/nf-http-httpsetserviceconfiguration"/>
     /// and <see href="https://learn.microsoft.com/windows/win32/api/http/ne-http-http_service_config_id"/>
     /// <br/><br/>
-    /// If you don't want to guess required <paramref name="tlsClientHelloBytesDestination"/> size before first invocation,
-    /// you should call first with <paramref name="tlsClientHelloBytesDestination"/> set to empty size, so that you can retrieve through <paramref name="bytesReturned"/> the buffer size you need,
-    /// then allocate that amount of memory, then retry the query.
+    /// If you don't want to guess the required <paramref name="tlsClientHelloBytesDestination"/> size before first invocation,
+    /// you should first call with <paramref name="tlsClientHelloBytesDestination"/> set to empty size, so that you can retrieve the required buffer size from <paramref name="bytesReturned"/>,
+    /// then allocate that amount of memory and retry the query.
     /// </remarks>
     /// <returns>
     /// True, if fetching TLS client hello was successful, false if <paramref name="tlsClientHelloBytesDestination"/> size is not large enough.
     /// If non-successful for other reason throws an exception.
     /// </returns>
+    /// <exception cref="HttpSysException">Any HttpSys error except for ERROR_INSUFFICIENT_BUFFER or ERROR_MORE_DATA.</exception>
+    /// <exception cref="InvalidOperationException">If HttpSys does not support querying the TLS Client Hello.</exception>
     bool TryGetTlsClientHello(Span<byte> tlsClientHelloBytesDestination, out int bytesReturned);
 }

src/Servers/HttpSys/src/PublicAPI.Unshipped.txt

@@ -1,3 +1,5 @@
 #nullable enable
 Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions.RequestQueueSecurityDescriptor.get -> System.Security.AccessControl.GenericSecurityDescriptor?
 Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions.RequestQueueSecurityDescriptor.set -> void
+Microsoft.AspNetCore.Server.HttpSys.IHttpSysRequestPropertyFeature
+Microsoft.AspNetCore.Server.HttpSys.IHttpSysRequestPropertyFeature.TryGetTlsClientHello(System.Span<byte> tlsClientHelloBytesDestination, out int bytesReturned) -> bool

src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs

@@ -33,7 +33,7 @@ public RequestContext(HttpSysListener server, uint? bufferSize, ulong requestId)
 
     public Request Request { get; private set; } = default!;
 
-    public Response Response { get; private set; } = default!;  
+    public Response Response { get; private set; } = default!;
 
     public WindowsPrincipal User => Request.User;
 

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

@@ -239,6 +239,27 @@ public async Task Https_ITlsHandshakeFeature_MatchesIHttpSysExtensionInfoFeature
         }
     }
 
+    [ConditionalFact]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2)]
+    public void Https_SetsIHttpSysRequestPropertyFeature()
+    {
+        using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
+        {
+            try
+            {
+                var requestPropertyFeature = httpContext.Features.Get<IHttpSysRequestPropertyFeature>();
+                Assert.NotNull(requestPropertyFeature);
+            }
+            catch (Exception ex)
+            {
+                await httpContext.Response.WriteAsync(ex.ToString());
+            }
+        }, LoggerFactory))
+        {
+            // nothing
+        }
+    }
+
     [ConditionalFact]
     [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2)]
     public async Task Https_SetsIHttpSysRequestTimingFeature()

src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs

@@ -188,7 +188,7 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, Action<Ht
     /// <see cref="KestrelServerOptions.ConfigureHttpsDefaults(Action{HttpsConnectionAdapterOptions})"/>.
     /// </summary>
     /// <param name="listenOptions">The <see cref="ListenOptions"/> to configure.</param>
-    /// <param name="httpsOptions">Options to configure HTTPS.</param>
+    /// <param name="httpsOptions">Options to configure HTTPS.</param>  
     /// <returns>The <see cref="ListenOptions"/>.</returns>
     public static ListenOptions UseHttps(this ListenOptions listenOptions, HttpsConnectionAdapterOptions httpsOptions)
     {