Feedback, renames

Author: Tratcher

samples/SampleApp/Startup.cs

@@ -73,15 +73,25 @@ public static Task Main(string[] args)
                         httpsOptions.SslProtocols = SslProtocols.Tls12;
                     });
 
-                    options.Configure(context.Configuration.GetSection("Kestrel"))
+                    options
+                        //.Configure()
+                        .Configure(context.Configuration.GetSection("Kestrel"))
                         .Endpoint("NamedEndpoint", opt =>
                         {
                             opt.Listener.Protocols = HttpProtocols.Http1;
                         })
                         .Endpoint("NamedHttpsEndpoint", opt =>
                         {
                             opt.Https.SslProtocols = SslProtocols.Tls12;
-                        });
+                        })
+                        /*
+                        .Endpoint(IPAddress.Loopback, basePort, options =>
+                        {
+                        })
+                        .LocalhostEndpoint(basePort, options =>
+                        {
+                        })*/
+                        ;
 
                     // Run callbacks on the transport thread
                     options.ApplicationSchedulingMode = SchedulingMode.Inline;

src/Kestrel.Core/Internal/IKestrelConfigBuilder.cs renamed to src/Kestrel.Core/Internal/IKestrelConfigurationBuilder.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
 {
-    public interface IKestrelConfigBuilder
+    public interface IKestrelConfigurationBuilder
     {
         void Build();
     }

src/Kestrel.Core/KestrelServerOptions.cs

@@ -61,7 +61,7 @@ public class KestrelServerOptions
         /// Provides a configuration source where endpoints will be loaded from on server start.
         /// The default is null.
         /// </summary>
-        public IKestrelConfigBuilder ConfigurationBuilder { get; set; }
+        public IKestrelConfigurationBuilder ConfigurationBuilder { get; set; }
 
         /// <summary>
         /// A default configuration action for all endpoints. Use for Listen, configuration, the default url, and URLs.

src/Kestrel.Https/KestrelServerOptionsHttpsExtensions.cs

@@ -8,11 +8,21 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https
 {
     public static class KestrelServerOptionsHttpsExtensions
     {
+        /// <summary>
+        /// Specifies a configuration Action to run for each newly created https endpoint.
+        /// </summary>
+        /// <param name="serverOptions"></param>
+        /// <param name="configureOptions"></param>
         public static void ConfigureHttpsDefaults(this KestrelServerOptions serverOptions, Action<HttpsConnectionAdapterOptions> configureOptions)
         {
             serverOptions.AdapterData[nameof(ConfigureHttpsDefaults)] = configureOptions;
         }
 
+        /// <summary>
+        /// Retrieves the configuration Action specified by ConfigureHttpsDefaults. This method is for infrastructure use only.
+        /// </summary>
+        /// <param name="serverOptions"></param>
+        /// <returns></returns>
         public static Action<HttpsConnectionAdapterOptions> GetHttpsDefaults(this KestrelServerOptions serverOptions)
         {
             if (serverOptions.AdapterData.TryGetValue(nameof(ConfigureHttpsDefaults), out var action))

src/Kestrel/Internal/ConfigReader.cs renamed to src/Kestrel/Internal/ConfigurationReader.cs

@@ -7,12 +7,12 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
 {
-    internal class ConfigReader
+    internal class ConfigurationReader
     {
         private IConfiguration _configuration;
         private IList<EndpointConfig> _endpoints;
 
-        public ConfigReader(IConfiguration configuration)
+        public ConfigurationReader(IConfiguration configuration)
         {
             // May be null
             _configuration = configuration;
@@ -43,15 +43,14 @@ private void ReadEndpoints()
             var endpointsConfig = _configuration.GetSection("Endpoints").GetChildren();
             foreach (var endpointConfig in endpointsConfig)
             {
-                /*
-                 "EndpointName": {
-                    "Url": "https://*:5463",
-                    "Certificate": {
-                        "Path": "testCert.pfx",
-                        "Password": "testPassword"
-                    }
-                }
-                */
+                // "EndpointName": {
+                //    "Url": "https://*:5463",
+                //    "Certificate": {
+                //        "Path": "testCert.pfx",
+                //        "Password": "testPassword"
+                //    }
+                // }
+                
                 var url = endpointConfig["Url"];
                 if (string.IsNullOrEmpty(url))
                 {

src/Kestrel/KestrelConfigBuilder.cs renamed to src/Kestrel/KestrelConfigurationBuilder.cs

@@ -11,20 +11,17 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
-using Microsoft.AspNetCore.Server.Kestrel.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Server.Kestrel
 {
-    public class KestrelConfigBuilder : IKestrelConfigBuilder
+    public class KestrelConfigurationBuilder : IKestrelConfigurationBuilder
     {
-        internal KestrelConfigBuilder(KestrelServerOptions options, IConfiguration configuration)
+        internal KestrelConfigurationBuilder(KestrelServerOptions options, IConfiguration configuration)
         {
             Options = options ?? throw new ArgumentNullException(nameof(options));
             Configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
-
-            Options.ConfigurationBuilder = this;
         }
 
         public KestrelServerOptions Options { get; }
@@ -37,7 +34,7 @@ internal KestrelConfigBuilder(KestrelServerOptions options, IConfiguration confi
         /// </summary>
         /// <param name="name"></param>
         /// <param name="configureOptions"></param>
-        public KestrelConfigBuilder Endpoint(string name, Action<EndpointConfiguration> configureOptions)
+        public KestrelConfigurationBuilder Endpoint(string name, Action<EndpointConfiguration> configureOptions)
         {
             if (string.IsNullOrEmpty(name))
             {
@@ -57,7 +54,7 @@ public void Build()
             }
             Options.ConfigurationBuilder = null;
 
-            var configReader = new ConfigReader(Configuration);
+            var configReader = new ConfigurationReader(Configuration);
 
             foreach (var endpoint in configReader.Endpoints)
             {
@@ -72,7 +69,11 @@ public void Build()
                     Options.GetHttpsDefaults()(httpsOptions);
 
                     var certInfo = new CertificateConfig(endpoint.CertConfig);
-                    if (certInfo.IsFileCert)
+                    if (certInfo.IsFileCert && certInfo.IsStoreCert)
+                    {
+                        throw new InvalidOperationException($"The endpoint {endpoint.Name} specified multiple certificate sources.");
+                    }
+                    else if (certInfo.IsFileCert)
                     {
                         var env = Options.ApplicationServices.GetRequiredService<IHostingEnvironment>();
                         httpsOptions.ServerCertificate = new X509Certificate2(Path.Combine(env.ContentRootPath, certInfo.Path), certInfo.Password);
@@ -85,7 +86,7 @@ public void Build()
                     else if (httpsOptions.ServerCertificate == null)
                     {
                         var provider = Options.ApplicationServices.GetRequiredService<IDefaultHttpsProvider>();
-                        httpsOptions.ServerCertificate = provider.Certificate; // May be null
+                        httpsOptions.ServerCertificate = provider.Certificate; // May be null, TODO: Throw
                     }
                 }
 
@@ -96,9 +97,10 @@ public void Build()
                     configureEndpoint(endpointConfig);
                 }
 
-                if (endpointConfig.Https != null && !listenOptions.ConnectionAdapters.Any(f => f.IsHttps))
+                // EndpointDefaults or configureEndpoint may have specified an https adapter.
+                if (https && !listenOptions.ConnectionAdapters.Any(f => f.IsHttps))
                 {
-                    // It's possible to get here with no cert configured. This will throw.
+                    // TODO: It's possible to get here with no cert configured. This will throw.
                     listenOptions.UseHttps(endpointConfig.Https);
                 }
 

src/Kestrel/KestrelServerOptionsConfigurationExtensions.cs

@@ -7,9 +7,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
 {
     public static class KestrelServerOptionsConfigurationExtensions
     {
-        public static KestrelConfigBuilder Configure(this KestrelServerOptions options, IConfiguration config)
+        public static KestrelConfigurationBuilder Configure(this KestrelServerOptions options, IConfiguration config)
         {
-            return new KestrelConfigBuilder(options, config); // Assigns itself to options.ConfigurationBuilder
+            var builder = new KestrelConfigurationBuilder(options, config);
+            options.ConfigurationBuilder = builder;
+            return builder;
         }
     }
 }