Merge pull request #253 from JensDll/staging

github-actions: merge staging into main
JensDll · Jun 1, 2023 · edd0a72 · edd0a72
2 parents 287fdb9 + 00fb211
commit edd0a72
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/services/aspnet.common/src/aspnet.common/DependencyInjection.cs b/services/aspnet.common/src/aspnet.common/DependencyInjection.cs
@@ -1,9 +1,9 @@
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
 namespace aspnet.common;
 
@@ -22,32 +22,38 @@ public static IServiceCollection AddAspNetShared(this IServiceCollection service
 
     public static void ConfigureCertificate(this WebHostBuilderContext context, KestrelServerOptions serverOptions)
     {
-        if (context.HostingEnvironment.IsDevelopment())
+        IConfigurationSection kestrelSection =
+            context.Configuration.GetRequiredSection(options.kestrel.KestrelServerOptions.Section);
+
+        IConfigurationSection httpsSection = kestrelSection.GetSection("Endpoints:Https");
+
+        if (!httpsSection.Exists())
         {
             return;
         }
 
-        serverOptions.Configure(context.Configuration.GetRequiredSection(options.kestrel.KestrelServerOptions.Section))
-            .Endpoint("Https", endpoint =>
+        KestrelConfigurationLoader loader = serverOptions.Configure(kestrelSection);
+
+        loader.Endpoint("Https", endpoint =>
+        {
+            string certPath =
+                endpoint.ConfigSection.GetValue<string>("Path") ??
+                throw new InvalidOperationException(
+                    "Failed to find certificate path on https endpoint configuration");
+
+            string keyPath =
+                endpoint.ConfigSection.GetValue<string>("KeyPath") ??
+                throw new InvalidOperationException(
+                    "Failed to find key path on https endpoint configuration");
+
+            X509Certificate2 certificate = X509Certificate2.CreateFromPemFile(certPath, keyPath);
+
+            endpoint.ListenOptions.UseHttps(certificate, httpsOptions =>
             {
-                string certPath =
-                    endpoint.ConfigSection.GetValue<string>("Path") ??
-                    throw new InvalidOperationException(
-                        "Failed to find certificate path on https endpoint configuration");
-
-                string keyPath =
-                    endpoint.ConfigSection.GetValue<string>("KeyPath") ??
-                    throw new InvalidOperationException(
-                        "Failed to find key path on https endpoint configuration");
-
-                X509Certificate2 certificate = X509Certificate2.CreateFromPemFile(certPath, keyPath);
-
-                endpoint.ListenOptions.UseHttps(certificate, httpsOptions =>
-                {
-                    X509Certificate2Collection chain = new();
-                    chain.ImportFromPemFile(certPath);
-                    httpsOptions.ServerCertificateChain = chain;
-                });
+                X509Certificate2Collection chain = new();
+                chain.ImportFromPemFile(certPath);
+                httpsOptions.ServerCertificateChain = chain;
             });
+        });
     }
 }
diff --git a/services/steganography.api/Dockerfile b/services/steganography.api/Dockerfile
@@ -53,6 +53,6 @@ USER appuser:appgroup
 
 ENV ASPNETCORE_URLS=""
 
-EXPOSE 8443
+EXPOSE 8080 8443
 
 ENTRYPOINT ["dotnet", "steganography.api.dll"]