Update LetsEncrypt framework and support disabling LetsEncrypt

+ Update to newer version of the library to obtain SSL certificates from LetsEncrypt. + Add option to disable LetsEncrypt via environment variable.
pine-vm · Mar 21, 2024 · 1b194d2 · 1b194d2
1 parent d40d7e0
commit 1b194d2
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 26 deletions.
diff --git a/implement/elm-time/Platform/WebService/Configuration.cs b/implement/elm-time/Platform/WebService/Configuration.cs
@@ -17,6 +17,8 @@ public static class Configuration
 
     public static string PublicWebHostUrlsSettingKey => "publicWebHostUrls";
 
+    public static string DisableLetsEncryptSettingKey => "disableLetsEncrypt";
+
     public static string[] PublicWebHostUrlsDefault => ["http://*", "https://*"];
 
     /// <summary>

diff --git a/implement/elm-time/Platform/WebService/PublicAppState.cs b/implement/elm-time/Platform/WebService/PublicAppState.cs
@@ -1,4 +1,4 @@
-using FluffySpoon.AspNet.LetsEncrypt;
+using FluffySpoon.AspNet.EncryptWeMust;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -88,7 +88,8 @@ public PublicAppState(
     public WebApplication Build(
         WebApplicationBuilder appBuilder,
         IHostEnvironment env,
-        IReadOnlyList<string> publicWebHostUrls)
+        IReadOnlyList<string> publicWebHostUrls,
+        bool? disableLetsEncrypt)
     {
         appBuilder.Services.AddLogging(logging =>
         {
@@ -115,7 +116,6 @@ public WebApplication Build(
             {
                 kestrelOptions.ConfigureHttpsDefaults(httpsOptions =>
                 {
-                    httpsOptions.ServerCertificateSelector = (_, _) => LetsEncryptRenewalService.Certificate;
                 });
             })
             .UseUrls([.. publicWebHostUrls])
@@ -129,8 +129,8 @@ public WebApplication Build(
             app.UseDeveloperExceptionPage();
         }
 
-        if (serverAndElmAppConfig.ServerConfig?.letsEncryptOptions != null)
-            app.UseFluffySpoonLetsEncryptChallengeApprovalMiddleware();
+        if (serverAndElmAppConfig.ServerConfig?.letsEncryptOptions is not null && !(disableLetsEncrypt ?? false))
+            app.UseFluffySpoonLetsEncrypt();
 
         app.Lifetime.ApplicationStopping.Register(() =>
         {
@@ -169,16 +169,24 @@ private void ConfigureServices(
     {
         var letsEncryptOptions = serverAndElmAppConfig.ServerConfig?.letsEncryptOptions;
 
-        if (letsEncryptOptions == null)
+        if (letsEncryptOptions is null)
         {
             logger.LogInformation("I did not find 'letsEncryptOptions' in the configuration. I continue without Let's Encrypt.");
         }
         else
         {
-            logger.LogInformation("I found 'letsEncryptOptions' in the configuration.");
-            services.AddFluffySpoonLetsEncryptRenewalService(letsEncryptOptions);
-            services.AddFluffySpoonLetsEncryptFileCertificatePersistence();
-            services.AddFluffySpoonLetsEncryptMemoryChallengePersistence();
+            if (serverAndElmAppConfig.DisableLetsEncrypt ?? false)
+            {
+                logger.LogInformation(
+                    "I found 'letsEncryptOptions' in the configuration, but 'disableLetsEncrypt' is set to true. I continue without Let's Encrypt.");
+            }
+            else
+            {
+                logger.LogInformation("I found 'letsEncryptOptions' in the configuration.");
+                services.AddFluffySpoonLetsEncrypt(letsEncryptOptions);
+                services.AddFluffySpoonLetsEncryptFileCertificatePersistence();
+                services.AddFluffySpoonLetsEncryptMemoryChallengePersistence();
+            }
         }
 
         Asp.ConfigureServices(services);
@@ -707,4 +715,5 @@ public record ServerAndElmAppConfig(
     WebServiceConfigJson? ServerConfig,
     Func<string, Result<string, StateShim.InterfaceToHost.FunctionApplicationResult>> ProcessEventInElmApp,
     PineValue SourceComposition,
-    InterfaceToHost.BackendEventResponseStruct? InitOrMigrateCmds);
+    InterfaceToHost.BackendEventResponseStruct? InitOrMigrateCmds,
+    bool? DisableLetsEncrypt);
diff --git a/implement/elm-time/Platform/WebService/StartupAdminInterface.cs b/implement/elm-time/Platform/WebService/StartupAdminInterface.cs
@@ -115,6 +115,10 @@ public void Configure(
 
         var adminPassword = configuration?.GetValue<string>(Configuration.AdminPasswordSettingKey);
 
+        var disableLetsEncrypt =
+            configuration?.GetValue<string>(Configuration.DisableLetsEncryptSettingKey)
+            ?.Equals("true", StringComparison.InvariantCultureIgnoreCase);
+
         object avoidConcurrencyLock = new();
 
         var processStoreFileStore = processStoreForFileStore.fileStore;
@@ -252,8 +256,9 @@ IHost buildWebHost(
                                         }
                                     },
                                     SourceComposition: processAppConfig.appConfigComponent,
-                                    InitOrMigrateCmds: restoreProcessOk.initOrMigrateCmds
-                                );
+                                    InitOrMigrateCmds: restoreProcessOk.initOrMigrateCmds,
+                                    DisableLetsEncrypt: disableLetsEncrypt
+                                    );
 
                             var publicAppState = new PublicAppState(
                                 serverAndElmAppConfig: serverAndElmAppConfig,
@@ -265,7 +270,8 @@ IHost buildWebHost(
                                 publicAppState.Build(
                                     appBuilder,
                                     env,
-                                    publicWebHostUrls: publicWebHostUrls);
+                                    publicWebHostUrls: publicWebHostUrls,
+                                    disableLetsEncrypt: disableLetsEncrypt);
 
                             publicAppState.ProcessEventTimeHasArrived();
 
@@ -299,13 +305,13 @@ IHost buildWebHost(
         app.Run(
             AdminInterfaceRun(
                 logger: logger,
-                processStoreFileStore: processStoreFileStore,
-                processStoreWriter: processStoreWriter,
-                adminPassword: adminPassword,
-                getPublicAppHost: () => publicAppHost,
-                avoidConcurrencyLock: avoidConcurrencyLock,
-                startPublicApp: startPublicApp,
-                stopPublicApp: stopPublicApp));
+                                processStoreFileStore: processStoreFileStore,
+                                processStoreWriter: processStoreWriter,
+                                adminPassword: adminPassword,
+                                getPublicAppHost: () => publicAppHost,
+                                avoidConcurrencyLock: avoidConcurrencyLock,
+                                startPublicApp: startPublicApp,
+                                stopPublicApp: stopPublicApp));
     }
 
     private static RequestDelegate AdminInterfaceRun(

diff --git a/implement/elm-time/Platform/WebService/WebServiceConfigJson.cs b/implement/elm-time/Platform/WebService/WebServiceConfigJson.cs
@@ -6,7 +6,7 @@ namespace ElmTime.Platform.WebService;
 public record WebServiceConfigJson(
     RateLimitWindow? singleRateLimitWindowPerClientIPv4Address = null,
     int? httpRequestEventSizeLimit = null,
-    FluffySpoon.AspNet.LetsEncrypt.LetsEncryptOptions? letsEncryptOptions = null);
+    FluffySpoon.AspNet.EncryptWeMust.Certes.LetsEncryptOptions? letsEncryptOptions = null);
 
 public record RateLimitWindow(
     int windowSizeInMs,

diff --git a/implement/elm-time/Program.cs b/implement/elm-time/Program.cs
@@ -18,7 +18,7 @@ namespace ElmTime;
 
 public class Program
 {
-    public static string AppVersionId => "2024-03-20";
+    public static string AppVersionId => "2024-03-21";
 
     private static int AdminInterfaceDefaultPort => 4000;
 

diff --git a/implement/elm-time/elm-time.csproj b/implement/elm-time/elm-time.csproj
@@ -5,8 +5,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>ElmTime</RootNamespace>
     <AssemblyName>elm-time</AssemblyName>
-    <AssemblyVersion>2024.0320.0.0</AssemblyVersion>
-    <FileVersion>2024.0320.0.0</FileVersion>
+    <AssemblyVersion>2024.0321.0.0</AssemblyVersion>
+    <FileVersion>2024.0321.0.0</FileVersion>
     <Nullable>enable</Nullable>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluffySpoon.AspNet.LetsEncrypt" Version="1.116.0" />
+    <PackageReference Include="FluffySpoon.AspNet.EncryptWeMust" Version="1.171.0" />
     <PackageReference Include="JavaScriptEngineSwitcher.V8" Version="3.21.5" />
     <PackageReference Include="Jint" Version="3.0.1" />
     <PackageReference Include="LibGit2Sharp" Version="0.28.0" />