PR review

Author: DeagleGross

src/Servers/HttpSys/src/HttpSysListener.cs

@@ -42,7 +42,7 @@ internal sealed partial class HttpSysListener : IDisposable
     private readonly UrlGroup _urlGroup;
     private readonly RequestQueue _requestQueue;
     private readonly DisconnectListener _disconnectListener;
-    private readonly TlsListener _tlsListener;
+    private readonly TlsListener? _tlsListener;
 
     private readonly object _internalLock;
 
@@ -73,13 +73,19 @@ public HttpSysListener(HttpSysOptions options, ILoggerFactory loggerFactory)
         try
         {
             _serverSession = new ServerSession();
-
             _requestQueue = new RequestQueue(options.RequestQueueName, options.RequestQueueMode, Logger);
-
             _urlGroup = new UrlGroup(_serverSession, _requestQueue, Logger);
 
-            _tlsListener = new TlsListener(options.TlsClientHelloBytesCallback);
-            _disconnectListener = new DisconnectListener(_requestQueue, Logger, onDisconnect: _tlsListener.ConnectionClosed);
+            if (options.TlsClientHelloBytesCallback is not null)
+            {
+                _tlsListener = new TlsListener(options.TlsClientHelloBytesCallback);
+                _disconnectListener = new DisconnectListener(_requestQueue, Logger, onDisconnect: _tlsListener.ConnectionClosed);
+            }
+            else
+            {
+                _tlsListener = null;
+                _disconnectListener = new DisconnectListener(_requestQueue, Logger);
+            }
         }
         catch (Exception exception)
         {
@@ -103,7 +109,7 @@ internal enum State
 
     internal UrlGroup UrlGroup => _urlGroup;
     internal RequestQueue RequestQueue => _requestQueue;
-    internal TlsListener TlsListener => _tlsListener;
+    internal TlsListener? TlsListener => _tlsListener;
     internal DisconnectListener DisconnectListener => _disconnectListener;
 
     public HttpSysOptions Options { get; }

src/Servers/HttpSys/src/HttpSysOptions.cs

@@ -237,15 +237,20 @@ public Http503VerbosityLevel Http503Verbosity
     /// Configures request headers to use <see cref="Encoding.Latin1"/> encoding.
     /// </summary>
     /// <remarks>
-    /// Defaults to `false`, in which case <see cref="Encoding.UTF8"/> will be used. />.
+    /// Defaults to <c>false</c>, in which case <see cref="Encoding.UTF8"/> will be used. />.
     /// </remarks>
     public bool UseLatin1RequestHeaders { get; set; }
 
     /// <summary>
     /// A callback to be invoked to get the TLS client hello bytes.
     /// By default is null, and will not be invoked if is null.
     /// </summary>
-    public Action<IFeatureCollection, ReadOnlySpan<byte>> TlsClientHelloBytesCallback { get; set; } = null!;
+    /// <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"/>
+    /// </remarks>
+    public Action<IFeatureCollection, ReadOnlySpan<byte>>? TlsClientHelloBytesCallback { get; set; }
 
     // Not called when attaching to an existing queue.
     internal void Apply(UrlGroup urlGroup, RequestQueue? requestQueue)

src/Servers/HttpSys/src/NativeInterop/DisconnectListener.cs

@@ -14,9 +14,9 @@ internal sealed partial class DisconnectListener
     private readonly RequestQueue _requestQueue;
     private readonly ILogger _logger;
 
-    internal Action<ulong> OnDisconnect { get; }
+    internal Action<ulong>? OnDisconnect { get; }
 
-    internal DisconnectListener(RequestQueue requestQueue, ILogger logger, Action<ulong> onDisconnect)
+    internal DisconnectListener(RequestQueue requestQueue, ILogger logger, Action<ulong>? onDisconnect = null)
     {
         _requestQueue = requestQueue;
         _logger = logger;
@@ -124,7 +124,7 @@ private bool TryRemoveConnectionCancellationToken(ulong connectionId, out Connec
         bool result;
         if (result = _connectionCancellationTokens.TryRemove(connectionId, out connectionCancellation!))
         {
-            OnDisconnect(connectionId);
+            OnDisconnect?.Invoke(connectionId);
         }
 
         return result;

src/Servers/HttpSys/src/NativeInterop/HttpApi.cs

@@ -34,10 +34,10 @@ internal static partial class HttpApi
     [LibraryImport(api_ms_win_core_io_LIB, SetLastError = true)]
     internal static partial uint CancelIoEx(SafeHandle handle, SafeNativeOverlapped overlapped);
 
-    internal unsafe delegate uint HttpGetRequestPropertyInvoker(SafeHandle requestQueueHandle, ulong requestId, uint propertyId,
+    internal unsafe delegate uint HttpGetRequestPropertyInvoker(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId,
         void* qualifier, uint qualifierSize, void* output, uint outputSize, IntPtr bytesReturned, IntPtr overlapped);
 
-    internal unsafe delegate uint HttpSetRequestPropertyInvoker(SafeHandle requestQueueHandle, ulong requestId, int propertyId,
+    internal unsafe delegate uint HttpSetRequestPropertyInvoker(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId,
         void* input, uint inputSize, IntPtr overlapped);
 
     // HTTP_PROPERTY_FLAGS.Present (1)
@@ -54,24 +54,12 @@ internal unsafe delegate uint HttpSetRequestPropertyInvoker(SafeHandle requestQu
 
     internal static unsafe uint HttpGetRequestProperty(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId,
         void* qualifier, uint qualifierSize, void* output, uint outputSize, IntPtr bytesReturned, IntPtr overlapped)
-    {
-        return HttpGetRequestProperty(requestQueueHandle, requestId, (uint)propertyId, qualifier, qualifierSize, output, outputSize, bytesReturned, overlapped);
-    }
-
-    internal static unsafe uint HttpGetRequestProperty(SafeHandle requestQueueHandle, ulong requestId, uint propertyId,
-        void* qualifier, uint qualifierSize, void* output, uint outputSize, IntPtr bytesReturned, IntPtr overlapped)
     {
         return HttpGetRequestInvoker!(requestQueueHandle, requestId, propertyId, qualifier, qualifierSize, output, outputSize, bytesReturned, overlapped);
     }
 
     internal static unsafe uint HttpSetRequestProperty(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId,
         void* input, uint inputSize, IntPtr overlapped)
-    {
-        return HttpSetRequestProperty(requestQueueHandle, requestId, (int)propertyId, input, inputSize, overlapped);
-    }
-
-    internal static unsafe uint HttpSetRequestProperty(SafeHandle requestQueueHandle, ulong requestId, int propertyId,
-        void* input, uint inputSize, IntPtr overlapped)
     {
         return HttpSetRequestInvoker!(requestQueueHandle, requestId, propertyId, input, inputSize, overlapped);
     }

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

@@ -1,3 +1,3 @@
 #nullable enable
-Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions.TlsClientHelloBytesCallback.get -> System.Action<Microsoft.AspNetCore.Http.Features.IFeatureCollection!, System.ReadOnlySpan<byte>>!
+Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions.TlsClientHelloBytesCallback.get -> System.Action<Microsoft.AspNetCore.Http.Features.IFeatureCollection!, System.ReadOnlySpan<byte>>?
 Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions.TlsClientHelloBytesCallback.set -> void

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

@@ -247,7 +247,7 @@ internal unsafe bool GetAndInvokeTlsClientHelloMessageBytesCallback(IFeatureColl
             {
                 statusCode = HttpApi.HttpGetRequestProperty(
                     Server.RequestQueue.Handle, requestId,
-                    11 /* HTTP_REQUEST_PROPERTY.HttpRequestPropertyTlsClientHello  */,
+                    (HTTP_REQUEST_PROPERTY)11 /* HTTP_REQUEST_PROPERTY.HttpRequestPropertyTlsClientHello  */,
                     qualifier: null, qualifierSize: 0,
                     pBuffer, (uint)buffer.Length,
                     bytesReturned: (IntPtr)bytesReturned, IntPtr.Zero);
@@ -277,7 +277,7 @@ internal unsafe bool GetAndInvokeTlsClientHelloMessageBytesCallback(IFeatureColl
                 {
                     statusCode = HttpApi.HttpGetRequestProperty(
                         Server.RequestQueue.Handle, requestId,
-                        11 /* HTTP_REQUEST_PROPERTY.HttpRequestPropertyTlsClientHello  */,
+                        (HTTP_REQUEST_PROPERTY)11 /* HTTP_REQUEST_PROPERTY.HttpRequestPropertyTlsClientHello  */,
                         qualifier: null, qualifierSize: 0,
                         pBuffer, (uint)buffer.Length,
                         bytesReturned: (IntPtr)bytesReturned, IntPtr.Zero);

src/Servers/HttpSys/src/RequestProcessing/RequestContextOfT.cs

@@ -48,7 +48,7 @@ public override async Task ExecuteAsync()
                 context = application.CreateContext(Features);
                 try
                 {
-                    if (Server.Options.TlsClientHelloBytesCallback is not null)
+                    if (Server.Options.TlsClientHelloBytesCallback is not null && Server.TlsListener is not null)
                     {
                         _ = DisconnectToken; // force disconnect to be followed. Required for TlsListener to keep cache about only active connections
                         Server.TlsListener.InvokeTlsClientHelloCallback(Features, Request);