Playing around

Author: JamesNK

src/Servers/Kestrel/Core/src/HttpsConfigurationService.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO.Pipelines;
 using System.Net;
 using System.Net.Security;
@@ -10,8 +12,6 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core;
 
@@ -50,10 +50,7 @@ public HttpsConfigurationService(IInitializer initializer)
     bool IHttpsConfigurationService.IsInitialized => _isInitialized || _initializer is not null;
 
     /// <inheritdoc/>
-    public void Initialize(
-        IHostEnvironment hostEnvironment,
-        ILogger<KestrelServer> serverLogger,
-        ILogger<HttpsConnectionMiddleware> httpsLogger)
+    public void Initialize(TlsConfigurationLoader tlsConfigurationLoader)
     {
         if (_isInitialized)
         {
@@ -62,7 +59,7 @@ public void Initialize(
 
         _isInitialized = true;
 
-        _tlsConfigurationLoader = new TlsConfigurationLoader(hostEnvironment, serverLogger, httpsLogger);
+        _tlsConfigurationLoader = tlsConfigurationLoader;
         _populateMultiplexedTransportFeatures = PopulateMultiplexedTransportFeaturesWorker;
         _useHttpsWithDefaults = UseHttpsWithDefaultsWorker;
     }
@@ -76,41 +73,42 @@ public void ApplyHttpsConfiguration(
         ConfigurationReader configurationReader)
     {
         EnsureInitialized();
-        _tlsConfigurationLoader!.ApplyHttpsConfiguration(httpsOptions, endpoint, serverOptions, defaultCertificateConfig, configurationReader);
+        _tlsConfigurationLoader.ApplyHttpsConfiguration(httpsOptions, endpoint, serverOptions, defaultCertificateConfig, configurationReader);
     }
 
     /// <inheritdoc/>
     public ListenOptions UseHttpsWithSni(ListenOptions listenOptions, HttpsConnectionAdapterOptions httpsOptions, EndpointConfig endpoint)
     {
         EnsureInitialized();
-        return _tlsConfigurationLoader!.UseHttpsWithSni(listenOptions, httpsOptions, endpoint);
+        return _tlsConfigurationLoader.UseHttpsWithSni(listenOptions, httpsOptions, endpoint);
     }
 
     /// <inheritdoc/>
     public CertificateAndConfig? LoadDefaultCertificate(ConfigurationReader configurationReader)
     {
         EnsureInitialized();
-        return _tlsConfigurationLoader!.LoadDefaultCertificate(configurationReader);
+        return _tlsConfigurationLoader.LoadDefaultCertificate(configurationReader);
     }
 
     /// <inheritdoc/>
     public void PopulateMultiplexedTransportFeatures(FeatureCollection features, ListenOptions listenOptions)
     {
         EnsureInitialized();
-        _populateMultiplexedTransportFeatures!.Invoke(features, listenOptions);
+        _populateMultiplexedTransportFeatures.Invoke(features, listenOptions);
     }
 
     /// <inheritdoc/>
     public ListenOptions UseHttpsWithDefaults(ListenOptions listenOptions)
     {
         EnsureInitialized();
-        return _useHttpsWithDefaults!.Invoke(listenOptions);
+        return _useHttpsWithDefaults.Invoke(listenOptions);
     }
 
     /// <summary>
     /// If this instance has not been initialized, initialize it if possible and throw otherwise.
     /// </summary>
     /// <exception cref="InvalidOperationException">If initialization is not possible.</exception>
+    [MemberNotNull(nameof(_useHttpsWithDefaults), nameof(_tlsConfigurationLoader), nameof(_populateMultiplexedTransportFeatures))]
     private void EnsureInitialized()
     {
         if (!_isInitialized)
@@ -124,6 +122,10 @@ private void EnsureInitialized()
                 throw new InvalidOperationException(CoreStrings.NeedHttpsConfiguration);
             }
         }
+
+        Debug.Assert(_useHttpsWithDefaults != null);
+        Debug.Assert(_tlsConfigurationLoader != null);
+        Debug.Assert(_populateMultiplexedTransportFeatures != null);
     }
 
     /// <summary>
@@ -228,24 +230,17 @@ internal interface IInitializer
     /// <inheritdoc/>
     internal sealed class Initializer : IInitializer
     {
-        private readonly IHostEnvironment _hostEnvironment;
-        private readonly ILogger<KestrelServer> _serverLogger;
-        private readonly ILogger<HttpsConnectionMiddleware> _httpsLogger;
-
-        public Initializer(
-            IHostEnvironment hostEnvironment,
-            ILogger<KestrelServer> serverLogger,
-            ILogger<HttpsConnectionMiddleware> httpsLogger)
+        private readonly TlsConfigurationLoader _configurationLoader;
+
+        public Initializer(TlsConfigurationLoader configurationLoader)
         {
-            _hostEnvironment = hostEnvironment;
-            _serverLogger = serverLogger;
-            _httpsLogger = httpsLogger;
+            _configurationLoader = configurationLoader;
         }
 
         /// <inheritdoc/>
         public void Initialize(IHttpsConfigurationService httpsConfigurationService)
         {
-            httpsConfigurationService.Initialize(_hostEnvironment, _serverLogger, _httpsLogger);
+            httpsConfigurationService.Initialize(_configurationLoader);
         }
     }
 }

src/Servers/Kestrel/Core/src/IHttpsConfigurationService.cs

@@ -5,9 +5,6 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
-using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core;
 
@@ -28,10 +25,7 @@ internal interface IHttpsConfigurationService
     /// <summary>
     /// Replaces the implementations off all other methods with functioning (as opposed to throwing) versions.
     /// </summary>
-    void Initialize(
-        IHostEnvironment hostEnvironment,
-        ILogger<KestrelServer> serverLogger,
-        ILogger<HttpsConnectionMiddleware> httpsLogger);
+    void Initialize(TlsConfigurationLoader tlsConfigurationLoader);
 
     /// <summary>
     /// Applies various configuration settings to <paramref name="httpsOptions"/> and <paramref name="endpoint"/>.

src/Servers/Kestrel/Core/src/KestrelServer.cs

@@ -8,8 +8,6 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
-using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Metrics;
 using Microsoft.Extensions.Options;
@@ -80,7 +78,7 @@ private sealed class SimpleHttpsConfigurationService : IHttpsConfigurationServic
     {
         public bool IsInitialized => true;
 
-        public void Initialize(IHostEnvironment hostEnvironment, ILogger<KestrelServer> serverLogger, ILogger<HttpsConnectionMiddleware> httpsLogger)
+        public void Initialize(TlsConfigurationLoader tlsConfigurationLoader)
         {
             // Already initialized
         }

src/Servers/Kestrel/Core/src/KestrelServerOptions.cs

@@ -291,7 +291,7 @@ internal void EnableHttpsConfiguration()
             var hostEnvironment = ApplicationServices.GetRequiredService<IHostEnvironment>();
             var logger = ApplicationServices.GetRequiredService<ILogger<KestrelServer>>();
             var httpsLogger = ApplicationServices.GetRequiredService<ILogger<HttpsConnectionMiddleware>>();
-            httpsConfigurationService.Initialize(hostEnvironment, logger, httpsLogger);
+            httpsConfigurationService.Initialize(new TlsConfigurationLoader(hostEnvironment, logger, httpsLogger));
         }
     }
 

src/Servers/Kestrel/Core/test/KestrelServerTests.cs

@@ -296,17 +296,19 @@ private static KestrelServerImpl CreateKestrelServer(
         var httpsConfigurationService = new HttpsConfigurationService();
         if (options?.ApplicationServices is IServiceProvider serviceProvider)
         {
-            httpsConfigurationService.Initialize(
+            var tlsConfigurationLoader = new TlsConfigurationLoader(
                 serviceProvider.GetRequiredService<IHostEnvironment>(),
                 serviceProvider.GetRequiredService<ILogger<KestrelServer>>(),
                 serviceProvider.GetRequiredService<ILogger<HttpsConnectionMiddleware>>());
+
+            httpsConfigurationService.Initialize(tlsConfigurationLoader);
         }
-	
+
         return new KestrelServerImpl(
             Options.Create<KestrelServerOptions>(options),
             transportFactories,
             multiplexedFactories,
-			httpsConfigurationService,
+            httpsConfigurationService,
             loggerFactory ?? new LoggerFactory(new[] { new KestrelTestLoggerProvider() }),
             metrics ?? new KestrelMetrics(new TestMeterFactory()));
     }

src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs

@@ -38,6 +38,7 @@ public static IWebHostBuilder UseHttpsConfiguration(this IWebHostBuilder hostBui
         return hostBuilder.ConfigureServices(services =>
         {
             services.AddSingleton<HttpsConfigurationService.IInitializer, HttpsConfigurationService.Initializer>();
+            services.AddSingleton<TlsConfigurationLoader>();
         });
     }
 

src/Servers/Kestrel/Kestrel/test/KestrelConfigurationLoaderTests.cs

@@ -28,6 +28,7 @@ private KestrelServerOptions CreateServerOptions()
             .AddSingleton<IHostEnvironment>(env)
             .AddSingleton(new KestrelMetrics(new TestMeterFactory()))
             .AddSingleton<IHttpsConfigurationService, HttpsConfigurationService>()
+            .AddSingleton<TlsConfigurationLoader>()
             .AddSingleton<HttpsConfigurationService.IInitializer, HttpsConfigurationService.Initializer>()
             .BuildServiceProvider();
         return serverOptions;

src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs

@@ -42,6 +42,7 @@ private static KestrelServerOptions CreateServerOptions()
         serverOptions.ApplicationServices = new ServiceCollection()
             .AddLogging()
             .AddSingleton<IHttpsConfigurationService, HttpsConfigurationService>()
+            .AddSingleton<TlsConfigurationLoader>()
             .AddSingleton<HttpsConfigurationService.IInitializer, HttpsConfigurationService.Initializer>()
             .AddSingleton(env.Object)
             .AddSingleton(new KestrelMetrics(new TestMeterFactory()))

src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs

@@ -88,6 +88,7 @@ public TestServer(RequestDelegate app, TestServiceContext context, Action<Kestre
                 services.AddSingleton(context.LoggerFactory);
                 services.AddSingleton(context.Metrics);
                 services.AddSingleton<IHttpsConfigurationService, HttpsConfigurationService>();
+                services.AddSingleton<TlsConfigurationLoader>();
                 services.AddSingleton<HttpsConfigurationService.IInitializer, HttpsConfigurationService.Initializer>();
 
                 services.AddSingleton<IServer>(sp =>