Add support for UseHttps() without explicit opt-in

Author: amcasey

src/Servers/Kestrel/Core/src/Internal/KestrelServerOptionsSetup.cs

@@ -8,22 +8,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 internal sealed class KestrelServerOptionsSetup : IConfigureOptions<KestrelServerOptions>
 {
     private readonly IServiceProvider _services;
-    private readonly bool _disableDefaultCertificate;
 
     public KestrelServerOptionsSetup(IServiceProvider services)
-    {
-        _services = services;
-        _disableDefaultCertificate = true;
-    }
-
-    public KestrelServerOptionsSetup(IServiceProvider services, ITlsConfigurationLoader _)
     {
         _services = services;
     }
 
     public void Configure(KestrelServerOptions options)
     {
         options.ApplicationServices = _services;
-        options.DisableDefaultCertificate = _disableDefaultCertificate;
     }
 }

src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs

@@ -7,7 +7,10 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Server.Kestrel;
 
@@ -16,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel;
 /// </summary>
 public class KestrelConfigurationLoader
 {
-    private readonly ITlsConfigurationLoader? _tlsLoader;
+    private ITlsConfigurationLoader? _tlsLoader;
     private bool _loaded;
 
     internal KestrelConfigurationLoader(
@@ -33,6 +36,24 @@ internal KestrelConfigurationLoader(
         _tlsLoader = tlsLoader;
     }
 
+    internal bool IsTlsConfigurationLoadingEnabled => _tlsLoader is not null;
+
+    internal void EnableTlsConfigurationLoading(
+        IHostEnvironment hostEnvironment,
+        ILogger<KestrelServer> serverLogger,
+        ILogger<HttpsConnectionMiddleware> httpsLogger)
+    {
+        if (_tlsLoader is null)
+        {
+            _tlsLoader = new TlsConfigurationLoader(hostEnvironment, serverLogger, httpsLogger);
+
+            if (_loaded)
+            {
+                Reload();
+            }
+        }
+    }
+
     /// <summary>
     /// Gets the <see cref="KestrelServerOptions"/>.
     /// </summary>

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

@@ -262,7 +262,7 @@ internal void ApplyHttpsDefaults(HttpsConnectionAdapterOptions httpsOptions)
 
     internal void ApplyDefaultCertificate(HttpsConnectionAdapterOptions httpsOptions)
     {
-        if (DisableDefaultCertificate)
+        if (ConfigurationLoader is not null && !ConfigurationLoader.IsTlsConfigurationLoadingEnabled)
         {
             throw new InvalidOperationException("You need to call UseHttpsConfiguration"); // TODO (acasey): message
         }
@@ -414,6 +414,24 @@ public KestrelConfigurationLoader Configure(IConfiguration config, bool reloadOn
         return loader;
     }
 
+    internal void EnableTlsConfigurationLoading()
+    {
+        // TODO (acasey): keep it around in case someone calls Configure later?
+        if (ConfigurationLoader is not null)
+        {
+            if (ApplicationServices is null)
+            {
+                throw new InvalidOperationException($"{nameof(ApplicationServices)} must not be null. This is normally set automatically via {nameof(IConfigureOptions<KestrelServerOptions>)}.");
+            }
+
+            var hostEnvironment = ApplicationServices.GetRequiredService<IHostEnvironment>();
+            var serverLogger = ApplicationServices.GetRequiredService<ILogger<KestrelServer>>();
+            var httpsLogger = ApplicationServices.GetRequiredService<ILogger<HttpsConnectionMiddleware>>();
+
+            ConfigurationLoader.EnableTlsConfigurationLoading(hostEnvironment, serverLogger, httpsLogger);
+        }
+    }
+
     /// <summary>
     /// Bind to the given IP address and port.
     /// </summary>

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

@@ -163,6 +163,9 @@ public static ListenOptions UseHttps(this ListenOptions listenOptions, Action<Ht
     {
         ArgumentNullException.ThrowIfNull(configureOptions);
 
+        // TODO (acasey): apply to other overloads?
+        listenOptions.KestrelServerOptions.EnableTlsConfigurationLoading();
+
         var options = new HttpsConnectionAdapterOptions();
 
         // This will throw if there are configured defaults and defaults are not supported (i.e. in slim scenarios)