adjusted certificate options

Author: kerryjiang

samples/ConfigSample/appsettings.tls.json

@@ -6,8 +6,10 @@
                 "ip": "Any",
                 "port": 4040,
                 "authenticationOptions" : {
-                    "filePath": "supersocket.pfx",
-                    "password": "supersocket",
+                    "certificateOptions" : {
+                        "filePath": "supersocket.pfx",
+                        "password": "supersocket"
+                    },                    
                     "enabledSslProtocols": "Tls12"
                 }
             }

samples/LiveChat/appsettings.json

@@ -19,8 +19,10 @@
             "ip": "Any",
             "port": 4041,
             "authenticationOptions": {
-                "filePath": "supersocket.pfx",
-                "password": "supersocket",
+                "certificateOptions": {
+                    "filePath": "supersocket.pfx",
+                    "password": "supersocket"
+                },
                 "enabledSslProtocols": "Tls12"
             }
         }

samples/WebSocketServer/appsettings.json

@@ -10,8 +10,10 @@
                 "ip": "Any",
                 "port": 4041,
                 "authenticationOptions": {
-                    "filePath": "supersocket.pfx",
-                    "password": "supersocket",
+                    "certificateOptions": {
+                        "filePath": "supersocket.pfx",
+                        "password": "supersocket"
+                    },
                     "enabledSslProtocols": "Tls12"
                 }
             }

src/SuperSocket.Primitives/ServerAuthenticationOptions.cs src/SuperSocket.Primitives/CertificateOptions.cs

@@ -1,12 +1,11 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 
-namespace SuperSocket
+namespace SuperSocket.Server.Abstractions
 {
-    public class ServerAuthenticationOptions : SslServerAuthenticationOptions
+    public class CertificateOptions
     {
         /// <summary>
         /// Gets the certificate file path (pfx).
@@ -46,12 +45,8 @@ public class ServerAuthenticationOptions : SslServerAuthenticationOptions
         /// </summary>
         public X509KeyStorageFlags KeyStorageFlags { get; set; }
 
-        public void EnsureCertificate()
+        public X509Certificate GetCertificate()
         {
-            // The certificate is there already
-            if (this.ServerCertificate != null)
-                return;            
-
             // load certificate from pfx file
             if (!string.IsNullOrEmpty(FilePath))
             {
@@ -62,28 +57,21 @@ public void EnsureCertificate()
                     filePath = Path.Combine(AppContext.BaseDirectory, filePath);
                 }
 
-                ServerCertificate = new X509Certificate2(filePath, Password, KeyStorageFlags);
+                return new X509Certificate2(filePath, Password, KeyStorageFlags);
             }
             else if (!string.IsNullOrEmpty(Thumbprint)) // load certificate from certificate store
             {
-                var store = new X509Store((StoreName)Enum.Parse(typeof(StoreName), StoreName), StoreLocation);
+                using var store = new X509Store((StoreName)Enum.Parse(typeof(StoreName), StoreName), StoreLocation);
 
                 store.Open(OpenFlags.ReadOnly);
 
-                ServerCertificate = store.Certificates.OfType<X509Certificate2>()
+                return store.Certificates.OfType<X509Certificate2>()
                     .FirstOrDefault(c => c.Thumbprint.Equals(Thumbprint, StringComparison.OrdinalIgnoreCase));
-
-                store.Close();
             }
             else
             {
                 throw new Exception($"Either {FilePath} or {Thumbprint} is required to load the certificate.");
             }
         }
-
-        public override string ToString()
-        {
-            return this.EnabledSslProtocols.ToString();
-        }
     }
 }

src/SuperSocket.Server.Abstractions/ListenOptions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Security.Authentication;
 
 namespace SuperSocket.Server.Abstractions
 {

src/SuperSocket.Server.Abstractions/ServerAuthenticationOptions.cs

@@ -0,0 +1,31 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+
+namespace SuperSocket.Server.Abstractions
+{
+    public class ServerAuthenticationOptions : SslServerAuthenticationOptions
+    {
+        /// <summary>
+        /// The certificate options.
+        /// </summary>
+        public CertificateOptions CertificateOptions { get; set; }
+
+        public void EnsureCertificate()
+        {
+            var certificateOptions = CertificateOptions;
+
+            if (certificateOptions != null)
+            {
+                ServerCertificate = certificateOptions.GetCertificate();
+            }
+        }
+
+        public override string ToString()
+        {
+            return EnabledSslProtocols.ToString();
+        }
+    }
+}

test/SuperSocket.Tests/GzipSecureHostConfigurator.cs

@@ -38,8 +38,11 @@ public override void Configure(ISuperSocketHostBuilder hostBuilder)
 
                     listener.AuthenticationOptions = new ServerAuthenticationOptions
                     {
-                        FilePath = "supersocket.pfx",
-                        Password = "supersocket",
+                        CertificateOptions = new CertificateOptions
+                            {
+                                FilePath = "supersocket.pfx",
+                                Password = "supersocket"
+                            },
                         EnabledSslProtocols = GetServerEnabledSslProtocols()
                     };
                 });

test/SuperSocket.Tests/SecureHostConfigurator.cs

@@ -43,8 +43,11 @@ public override void Configure(ISuperSocketHostBuilder hostBuilder)
                         authenticationOptions = listener.AuthenticationOptions = new ServerAuthenticationOptions();
                     }
 
-                    authenticationOptions.FilePath = "supersocket.pfx";
-                    authenticationOptions.Password = "supersocket";
+                    authenticationOptions.CertificateOptions = new CertificateOptions
+                    {
+                        FilePath = "supersocket.pfx",
+                        Password = "supersocket"
+                    };
 
                     if (authenticationOptions.EnabledSslProtocols == SslProtocols.None)
                     {