Code Cleanup

Author: Aeliux

src/EasySign.Cli/BundleCommandProvider.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.CommandLine;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.CommandLine;
 
 using Microsoft.Extensions.Logging;
 
@@ -13,7 +8,7 @@ namespace SAPTeam.EasySign.Cli
 {
     internal class BundleCommandProvider : CommandProvider<Bundle>
     {
-        ILogger _bundleLogger;
+        private readonly ILogger _bundleLogger;
 
         public BundleCommandProvider(ILogger logger, ILogger bundleLogger)
         {
@@ -29,7 +24,7 @@ public override void InitializeBundle(string bundlePath)
 
         public override RootCommand GetRootCommand()
         {
-            var root = new RootCommand("Easy Digital Signing Tool")
+            RootCommand root = new RootCommand("Easy Digital Signing Tool")
             {
                 Add,
                 Sign,

src/EasySign.Cli/Program.cs

@@ -1,23 +1,13 @@
-using System.Collections.Concurrent;
-using System.CommandLine;
-using System.IO;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using System.CommandLine;
 
 using Serilog;
 using Serilog.Extensions.Logging;
 
-using Spectre.Console;
-
 namespace SAPTeam.EasySign.Cli
 {
     internal class Program
     {
-        static int Main(string[] args)
+        private static int Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
                 .Enrich.WithThreadId()
@@ -29,23 +19,22 @@ static int Main(string[] args)
                 .MinimumLevel.Debug() // Minimum log level
                 .CreateLogger();
 
-            var appLogger = Log.Logger.ForContext("Context", "Main");
+            Serilog.ILogger appLogger = Log.Logger.ForContext("Context", "Main");
             appLogger.Information("Starting EasySign CLI at {DateTime}", DateTime.Now);
 
-            var bundleLogger = new SerilogLoggerFactory(Log.Logger.ForContext("Context", "Bundle"))
+            Microsoft.Extensions.Logging.ILogger bundleLogger = new SerilogLoggerFactory(Log.Logger.ForContext("Context", "Bundle"))
                 .CreateLogger("CommandProvider");
-            
-            var commandProviderLogger = new SerilogLoggerFactory(Log.Logger.ForContext("Context", "CommandProvider"))
+
+            Microsoft.Extensions.Logging.ILogger commandProviderLogger = new SerilogLoggerFactory(Log.Logger.ForContext("Context", "CommandProvider"))
                 .CreateLogger("CommandProvider");
 
-            var root = new BundleCommandProvider(commandProviderLogger, bundleLogger).GetRootCommand();
-            var exitCode = root.Invoke(args);
+            RootCommand root = new BundleCommandProvider(commandProviderLogger, bundleLogger).GetRootCommand();
+            int exitCode = root.Invoke(args);
 
             appLogger.Information("Shutting down EasySign CLI at {DateTime} with exit code {ExitCode}", DateTime.Now, exitCode);
 
             Log.CloseAndFlush();
             return exitCode;
         }
-
     }
 }

src/EasySign.CommandLine/BundleWorker.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
+using System.Security.Cryptography.X509Certificates;
 
 using Microsoft.Extensions.Logging;
 
@@ -54,15 +51,15 @@ protected virtual void RunAdd(StatusContext statusContext, bool replace, bool co
             statusContext.Status("[yellow]Adding Files[/]");
 
             Logger.LogDebug("Discovering files in the directory: {RootPath}", Bundle.RootPath);
-            var foundFiles = Utilities.SafeEnumerateFiles(Bundle.RootPath, "*").ToArray();
+            string[] foundFiles = Utilities.SafeEnumerateFiles(Bundle.RootPath, "*").ToArray();
             Logger.LogInformation("Discovered {FileCount} files", foundFiles.Count());
 
             Logger.LogInformation("Starting file adder multi-thread task");
             bool errorOccurred = false;
             _ = Parallel.ForEach(foundFiles, (file, state) =>
             {
                 if (file == Bundle.BundlePath) return;
-                var entryName = Manifest.GetNormalizedEntryName(Path.GetRelativePath(Bundle.RootPath, file));
+                string entryName = Manifest.GetNormalizedEntryName(Path.GetRelativePath(Bundle.RootPath, file));
 
                 Logger.LogInformation("Processing file: {EntryName}", entryName);
 
@@ -88,7 +85,7 @@ protected virtual void RunAdd(StatusContext statusContext, bool replace, bool co
                     else
                     {
                         Logger.LogDebug("Adding entry: {EntryName}", entryName);
-                        
+
                         Bundle.AddEntry(file);
 
                         Logger.LogInformation("Entry: {EntryName} Added", entryName);
@@ -159,14 +156,14 @@ protected virtual void RunSign(StatusContext statusContext, X509Certificate2Coll
             int divider = 0;
             int signs = 0;
 
-            foreach (var cert in certificates)
+            foreach (X509Certificate2 cert in certificates)
             {
                 if (divider++ > 0) AnsiConsole.WriteLine();
 
                 Logger.LogDebug("Loading certificate information for {Cert}", cert);
                 statusContext.Status("[yellow]Loading certificate informations[/]");
 
-                var grid = new Grid();
+                Grid grid = new Grid();
                 grid.AddColumn(new GridColumn().NoWrap());
                 grid.AddColumn(new GridColumn().PadLeft(2));
                 grid.AddRow("Certificate Info:");
@@ -193,7 +190,7 @@ protected virtual void RunSign(StatusContext statusContext, X509Certificate2Coll
                 Logger.LogDebug("Acquiring RSA private key for {cert}", cert);
                 statusContext.Status("[yellow]Preparing for signing[/]");
 
-                var prvKey = cert.GetRSAPrivateKey();
+                System.Security.Cryptography.RSA? prvKey = cert.GetRSAPrivateKey();
                 if (prvKey == null)
                 {
                     Logger.LogError("Failed to acquire RSA private key for {cert}", cert);
@@ -239,7 +236,7 @@ protected virtual void RunVerify(StatusContext statusContext)
                 throw new ApplicationException("Bundle is not initialized");
             }
 
-            var colorDict = new Dictionary<string, Color>()
+            Dictionary<string, Color> colorDict = new Dictionary<string, Color>()
             {
                 ["file_verified"] = Color.MediumSpringGreen,
                 ["file_failed"] = Color.OrangeRed1,
@@ -257,24 +254,24 @@ protected virtual void RunVerify(StatusContext statusContext)
             int verifiedCerts = 0;
             int divider = 0;
 
-            foreach (var certificateHash in Bundle.Signatures.Entries.Keys)
+            foreach (string certificateHash in Bundle.Signatures.Entries.Keys)
             {
                 if (divider++ > 0) AnsiConsole.WriteLine();
 
-                var certificate = Bundle.GetCertificate(certificateHash);
+                X509Certificate2 certificate = Bundle.GetCertificate(certificateHash);
 
                 Logger.LogDebug("Verifying certificate {cert}", certificate);
                 AnsiConsole.MarkupLine($"Verifying Certificate [{Color.Teal}]{certificate.GetNameInfo(X509NameType.SimpleName, false)}[/] Issued by [{Color.Aqua}]{certificate.GetNameInfo(X509NameType.SimpleName, true)}[/]");
 
-                var verifyCert = VerifyCertificate(certificate);
+                bool verifyCert = VerifyCertificate(certificate);
                 if (!verifyCert)
                 {
                     Logger.LogWarning("Skipping signature verification for {cert}", certificate);
                     continue;
                 }
 
                 Logger.LogDebug("Verifying signature for certificate {cert}", certificate);
-                var verifySign = Bundle.VerifySignature(certificateHash);
+                bool verifySign = Bundle.VerifySignature(certificateHash);
                 AnsiConsole.MarkupLine($"[{(verifySign ? Color.Green : Color.Red)}] Signature Verification {(verifySign ? "Successful" : "Failed")}[/]");
                 if (!verifySign)
                 {
@@ -326,7 +323,7 @@ protected virtual void RunVerify(StatusContext statusContext)
 
             _ = Parallel.ForEach(Bundle.Manifest.Entries, (entry) =>
             {
-                var verifyFile = false;
+                bool verifyFile = false;
 
                 Logger.LogDebug("Verifying file {file}", entry.Key);
 
@@ -399,10 +396,10 @@ protected bool VerifyCertificate(X509Certificate2 certificate)
                 throw new ApplicationException("Bundle is not initialized");
             }
 
-            List<bool> verifyResults = new();
+            List<bool> verifyResults = [];
 
             Logger.LogDebug("Verifying certificate {cert} with default verification policy", certificate);
-            var defaultVerification = Bundle.VerifyCertificate(certificate, out X509ChainStatus[] statuses);
+            bool defaultVerification = Bundle.VerifyCertificate(certificate, out X509ChainStatus[] statuses);
             verifyResults.Add(defaultVerification);
 
             Logger.LogInformation("Certificate verification with default policy for {cert}: {result}", certificate, defaultVerification);
@@ -418,10 +415,10 @@ protected bool VerifyCertificate(X509Certificate2 certificate)
                 {
                     Logger.LogWarning("Certificate has time validity issues, retrying verification with time check disabled");
 
-                    var policy = new X509ChainPolicy();
+                    X509ChainPolicy policy = new X509ChainPolicy();
                     policy.VerificationFlags |= X509VerificationFlags.IgnoreNotTimeValid;
 
-                    var noTimeVerification = Bundle.VerifyCertificate(certificate, out X509ChainStatus[] noTimeStatuses, policy: policy);
+                    bool noTimeVerification = Bundle.VerifyCertificate(certificate, out X509ChainStatus[] noTimeStatuses, policy: policy);
                     verifyResults.Add(noTimeVerification);
 
                     Logger.LogInformation("Certificate verification without time checking for {cert}: {result}", certificate, noTimeVerification);

src/EasySign.CommandLine/CommandProvider.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.CommandLine;
+using System.CommandLine;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
-using Spectre.Console;
-
 namespace SAPTeam.EasySign.CommandLine
 {
     /// <summary>
@@ -41,13 +36,13 @@ public Command Add
         {
             get
             {
-                var replaceOpt = new Option<bool>("--replace", "Replace existing entries");
+                Option<bool> replaceOpt = new Option<bool>("--replace", "Replace existing entries");
                 replaceOpt.AddAlias("-r");
 
-                var continueOpt = new Option<bool>("--continue", "Continue adding files if an error occurs");
+                Option<bool> continueOpt = new Option<bool>("--continue", "Continue adding files if an error occurs");
                 continueOpt.AddAlias("-c");
 
-                var command = new Command("add", "Create new bundle or update an existing one")
+                Command command = new Command("add", "Create new bundle or update an existing one")
                     {
                         BundlePath,
                         replaceOpt,
@@ -71,11 +66,11 @@ public Command Sign
         {
             get
             {
-                var pfxOpt = new Option<string>("--pfx", "PFX File contains certificate and private key");
-                var pfxPassOpt = new Option<string>("--pfx-password", "PFX File password");
-                var pfxNoPassOpt = new Option<bool>("--no-password", "Ignore PFX File password prompt");
+                Option<string> pfxOpt = new Option<string>("--pfx", "PFX File contains certificate and private key");
+                Option<string> pfxPassOpt = new Option<string>("--pfx-password", "PFX File password");
+                Option<bool> pfxNoPassOpt = new Option<bool>("--no-password", "Ignore PFX File password prompt");
 
-                var command = new Command("sign", "Sign bundle with certificate")
+                Command command = new Command("sign", "Sign bundle with certificate")
                     {
                         BundlePath,
                         pfxOpt,
@@ -102,7 +97,7 @@ public Command Verify
         {
             get
             {
-                var command = new Command("verify", "Verify bundle")
+                Command command = new Command("verify", "Verify bundle")
                     {
                         BundlePath,
                     };

src/EasySign.CommandLine/Utilities.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Linq;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 
 using Spectre.Console;
 
@@ -80,22 +76,24 @@ public static IEnumerable<string> SafeEnumerateFiles(string path, string searchP
         /// <returns>A collection of certificates.</returns>
         public static X509Certificate2Collection GetCertificates(string pfxFilePath, string pfxFilePassword, bool pfxNoPasswordPrompt)
         {
-            X509Certificate2Collection collection = new();
+            X509Certificate2Collection collection = [];
 
             if (!string.IsNullOrEmpty(pfxFilePath))
             {
                 string pfpass = !string.IsNullOrEmpty(pfxFilePassword) ? pfxFilePassword : !pfxNoPasswordPrompt ? SecurePrompt("Enter PFX File password (if needed): ") : "";
 
 #if NET9_0_OR_GREATER
-                    var tempCollection = X509CertificateLoader.LoadPkcs12CollectionFromFile(pfxFilePath, pfpass, X509KeyStorageFlags.EphemeralKeySet);
+                X509Certificate2Collection tempCollection = X509CertificateLoader.LoadPkcs12CollectionFromFile(pfxFilePath, pfpass, X509KeyStorageFlags.EphemeralKeySet);
 #else
-                var tempCollection = new X509Certificate2Collection();
+                X509Certificate2Collection tempCollection = [];
                 tempCollection.Import(pfxFilePath, pfpass, X509KeyStorageFlags.EphemeralKeySet);
 #endif
 
-                var cond = tempCollection.Where(x => x.HasPrivateKey);
+                IEnumerable<X509Certificate2> cond = tempCollection.Where(x => x.HasPrivateKey);
                 if (cond.Any())
+                {
                     collection.AddRange(cond.ToArray());
+                }
                 else
                 {
                     collection.AddRange(tempCollection);
@@ -106,13 +104,13 @@ public static X509Certificate2Collection GetCertificates(string pfxFilePath, str
                 X509Store store = new X509Store("MY", StoreLocation.CurrentUser);
                 store.Open(OpenFlags.ReadOnly | OpenFlags.OpenExistingOnly);
 
-                var mapping = new Dictionary<string, X509Certificate2>();
-                foreach (var cert in store.Certificates)
+                Dictionary<string, X509Certificate2> mapping = [];
+                foreach (X509Certificate2 cert in store.Certificates)
                 {
                     mapping[$"{cert.GetNameInfo(X509NameType.SimpleName, false)},{cert.GetNameInfo(X509NameType.SimpleName, true)},{cert.Thumbprint}"] = cert;
                 }
 
-                var selection = AnsiConsole.Prompt(
+                List<string> selection = AnsiConsole.Prompt(
                     new MultiSelectionPrompt<string>()
                         .PageSize(10)
                         .Title("Select Signing Certificates")
@@ -146,7 +144,7 @@ public static string SecurePrompt(string prompt)
         /// <param name="statuses">The array of X509 chain statuses.</param>
         public static void EnumerateStatuses(X509ChainStatus[] statuses)
         {
-            foreach (var status in statuses)
+            foreach (X509ChainStatus status in statuses)
             {
                 AnsiConsole.MarkupLine($"[{Color.IndianRed}]   {status.StatusInformation}[/]");
             }