Add configuration

Author: Aeliux

src/EasySign.Cli/Program.cs

@@ -30,9 +30,13 @@ private static int Main(string[] args)
             Microsoft.Extensions.Logging.ILogger commandProviderLogger = new SerilogLoggerFactory(Log.Logger.ForContext("Context", "CommandProvider"))
                 .CreateLogger("CommandProvider");
 
-            RootCommand root = new BundleCommandProvider(AppDirectory, commandProviderLogger, bundleLogger).GetRootCommand();
-            int exitCode = root.Invoke(args);
-
+            int exitCode;
+            using (var cp = new BundleCommandProvider(AppDirectory, commandProviderLogger, bundleLogger))
+            {
+                RootCommand root = cp.GetRootCommand();
+                exitCode = root.Invoke(args);
+            }
+            
             appLogger.Information("Shutting down EasySign CLI at {DateTime} with exit code {ExitCode}", DateTime.Now, exitCode);
 
             Log.CloseAndFlush();

src/EasySign.CommandLine/BundleWorker.cs

@@ -6,13 +6,12 @@
 
 namespace SAPTeam.EasySign.CommandLine
 {
-    public abstract partial class CommandProvider<T>
-        where T : Bundle
+    public abstract partial class CommandProvider<TBundle>
     {
         /// <summary>
         /// Gets or sets the bundle.
         /// </summary>
-        public T? Bundle { get; protected set; }
+        public TBundle? Bundle { get; protected set; }
 
         /// <summary>
         /// Initializes the bundle.

src/EasySign.CommandLine/CommandProvider.cs

@@ -1,5 +1,8 @@
 using System.CommandLine;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -11,8 +14,9 @@ namespace SAPTeam.EasySign.CommandLine
     /// <summary>
     /// Provides command definitions and handlers for the EasySign command line interface.
     /// </summary>
-    /// <typeparam name="T">The type of the bundle.</typeparam>
-    public abstract partial class CommandProvider<T>
+    /// <typeparam name="TBundle">The type of the bundle.</typeparam>
+    public abstract partial class CommandProvider<TBundle> : IDisposable
+        where TBundle : Bundle
     {
         /// <summary>
         /// Gets or sets the logger to use for logging.
@@ -24,6 +28,11 @@ public abstract partial class CommandProvider<T>
         /// </summary>
         public string AppDirectory { get; set; }
 
+        /// <summary>
+        /// Gets the application configurations.
+        /// </summary>
+        public Configuration Configuration { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CommandProvider{T}"/> class with the specified application directory and logger.
         /// </summary>
@@ -37,6 +46,17 @@ public abstract partial class CommandProvider<T>
         protected CommandProvider(string appDirectory, ILogger? logger)
         {
             AppDirectory = appDirectory ?? throw new ArgumentNullException(nameof(appDirectory));
+
+            if (File.Exists(Path.Combine(AppDirectory, "config.json")))
+            {
+                using var fs = File.OpenRead(Path.Combine(AppDirectory, "config.json"));
+                Configuration = JsonSerializer.Deserialize(fs, typeof(Configuration), SourceGenerationConfigurationContext.Default) as Configuration ?? new();
+            }
+            else
+            {
+                Configuration = new();
+            }
+
             Logger = logger ?? NullLogger.Instance;
         }
 
@@ -66,11 +86,11 @@ public Command Add
                 continueOpt.AddAlias("-c");
 
                 Command command = new Command("add", "Create new bundle or update an existing one")
-                    {
-                        BundlePath,
-                        replaceOpt,
-                        continueOpt,
-                    };
+                {
+                    BundlePath,
+                    replaceOpt,
+                    continueOpt,
+                };
 
                 command.SetHandler((bundlePath, replace, continueOnError) =>
                 {
@@ -121,10 +141,46 @@ public Command Sign
                             return;
                         }
 
-                        var subject = CertificateUtilities.GetSubjectNameFromUser();
-                        var issuedCert = CertificateUtilities.IssueCertificate(subject, rootCA);
+                        string? selectedCert = null;
+                        if (Configuration.IssuedCertificates.Count > 0)
+                        {
+                            selectedCert = AnsiConsole.Prompt<string>(
+                            new SelectionPrompt<string>()
+                                .PageSize(10)
+                                .Title("Select Self-Signing Certificate")
+                                .MoreChoicesText("[grey](Move up and down to see more certificates)[/]")
+                                .AddChoices(Configuration.IssuedCertificates.Keys)
+                                .AddChoices("Issue New Certificate"));
+                        }
+
+                        if (string.IsNullOrEmpty(selectedCert) || selectedCert == "Issue New Certificate")
+                        {
+                            var subject = CertificateUtilities.GetSubjectNameFromUser();
+                            var issuedCert = CertificateUtilities.IssueCertificate(subject, rootCA);
+
+                            var certFileName = $"{issuedCert.GetNameInfo(X509NameType.SimpleName, false).Replace(" ", "_")}-{issuedCert.GetSerialNumberString()[^6]}.pfx";
+                            var certFilePath = Path.Combine(AppDirectory, "certs", certFileName);
 
-                        certs = new X509Certificate2Collection(issuedCert);
+                            Directory.CreateDirectory(Path.Combine(AppDirectory, "certs"));
+
+                            using (var fs = File.Create(certFilePath))
+                            {
+                                fs.Write(issuedCert.Export(X509ContentType.Pfx));
+                            }
+
+                            Configuration.IssuedCertificates.Add(subject, certFileName);
+                            certs = new X509Certificate2Collection(issuedCert);
+                        }
+                        else
+                        {
+                            certs = [];
+                            var certFilePath = Path.Combine(AppDirectory, "certs", Configuration.IssuedCertificates[selectedCert]);
+#if NET9_0_OR_GREATER
+                            certs.AddRange(X509CertificateLoader.LoadPkcs12CollectionFromFile(certFilePath, null, X509KeyStorageFlags.EphemeralKeySet | X509KeyStorageFlags.Exportable));
+#else
+                            certs.Import(certFilePath, null, X509KeyStorageFlags.EphemeralKeySet | X509KeyStorageFlags.Exportable);
+#endif
+                        }
                     }
                     else
                     {
@@ -286,5 +342,29 @@ public Command SelfSign
 
             return null;
         }
+
+        /// <summary>
+        /// Writes the configuration to disk.
+        /// </summary>
+        public void WriteConfig()
+        {
+            string json = JsonSerializer.Serialize(Configuration, typeof(Configuration), SourceGenerationConfigurationContext.Default);
+            var buffer = Encoding.UTF8.GetBytes(json);
+
+            using (FileStream fs = File.OpenWrite(Path.Combine(AppDirectory, "config.json")))
+            {
+                fs.Write(buffer);
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            WriteConfig();
+
+            Bundle = null;
+
+            GC.SuppressFinalize(this);
+        }
     }
 }

src/EasySign.CommandLine/Configuration.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace SAPTeam.EasySign.CommandLine
+{
+    /// <summary>
+    /// Represents the configuration for the easysign command line tool.
+    /// </summary>
+    public class Configuration
+    {
+        /// <summary>
+        /// Gets or sets the list of issued certificates by the self signing root CA.
+        /// </summary>
+        public Dictionary<string, string> IssuedCertificates { get; set; } = [];
+    }
+
+    [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Metadata, WriteIndented = true, DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingDefault)]
+    [JsonSerializable(typeof(Configuration))]
+    internal partial class SourceGenerationConfigurationContext : JsonSerializerContext
+    {
+
+    }
+}