Load ClientCertificateMode from config

Author: Kahbazi

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

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Authentication;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.Extensions.Configuration;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
@@ -18,12 +19,14 @@ internal class ConfigurationReader
         private const string EndpointDefaultsKey = "EndpointDefaults";
         private const string EndpointsKey = "Endpoints";
         private const string UrlKey = "Url";
+        private const string ClientCertificateModeKey = "ClientCertificateMode";
 
         private readonly IConfiguration _configuration;
 
         private IDictionary<string, CertificateConfig> _certificates;
         private EndpointDefaults _endpointDefaults;
         private IEnumerable<EndpointConfig> _endpoints;
+        private ClientCertificateMode? _clientCertificateMode;
 
         public ConfigurationReader(IConfiguration configuration)
         {
@@ -33,6 +36,7 @@ public ConfigurationReader(IConfiguration configuration)
         public IDictionary<string, CertificateConfig> Certificates => _certificates ??= ReadCertificates();
         public EndpointDefaults EndpointDefaults => _endpointDefaults ??= ReadEndpointDefaults();
         public IEnumerable<EndpointConfig> Endpoints => _endpoints ??= ReadEndpoints();
+        public ClientCertificateMode? ClientCertificateMode => _clientCertificateMode ??= ReadClientCertificateMode();
 
         private IDictionary<string, CertificateConfig> ReadCertificates()
         {
@@ -100,6 +104,16 @@ private IEnumerable<EndpointConfig> ReadEndpoints()
             return endpoints;
         }
 
+        private ClientCertificateMode? ReadClientCertificateMode()
+        {
+            if (Enum.TryParse<ClientCertificateMode>(_configuration[ClientCertificateModeKey], ignoreCase: true, out var result))
+            {
+                return result;
+            }
+
+            return null;
+        }
+
         private static HttpProtocols? ParseProtocols(string protocols)
         {
             if (Enum.TryParse<HttpProtocols>(protocols, ignoreCase: true, out var result))

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

@@ -293,6 +293,8 @@ public void Load()
                     httpsOptions.ServerCertificate = LoadCertificate(endpoint.Certificate, endpoint.Name)
                         ?? httpsOptions.ServerCertificate;
 
+                    httpsOptions.ClientCertificateMode = ConfigurationReader.ClientCertificateMode ?? httpsOptions.ClientCertificateMode;
+
                     if (httpsOptions.ServerCertificate == null && httpsOptions.ServerCertificateSelector == null)
                     {
                         // Fallback

src/Servers/Kestrel/Kestrel/test/ConfigurationReaderTests.cs

@@ -7,13 +7,46 @@
 using System.Security.Authentication;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.Extensions.Configuration;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Tests
 {
     public class ConfigurationReaderTests
     {
+        [Fact]
+        public void ReadClientCertificateMode_ReturnsValue()
+        {
+            // Arrange
+            var config = new ConfigurationBuilder()
+                .AddInMemoryCollection(new Dictionary<string, string>
+                {
+                    ["ClientCertificateMode"] = "AllowCertificate"
+                })
+                .Build();
+
+            // Act
+            var reader = new ConfigurationReader(config);
+
+            // Assert
+            Assert.NotNull(reader.ClientCertificateMode);
+            Assert.Equal(ClientCertificateMode.AllowCertificate, reader.ClientCertificateMode);
+        }
+
+        [Fact]
+        public void ReadClientCertificateModeWhenNoClientCertificateMode_ReturnsNull()
+        {
+            // Arrange
+            var config = new ConfigurationBuilder().AddInMemoryCollection().Build();
+
+            // Act
+            var reader = new ConfigurationReader(config);
+
+            // Assert
+            Assert.Null(reader.ClientCertificateMode);
+        }
+
         [Fact]
         public void ReadCertificatesWhenNoCertificatesSection_ReturnsEmptyCollection()
         {