Make codes nullable compatible

Author: Aeliux

Directory.Build.props

@@ -20,7 +20,7 @@
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
     <InvariantGlobalization>true</InvariantGlobalization>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    <Nullable>disable</Nullable>
+    <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
 
     <SignAssembly>true</SignAssembly>

src/EasySign.Cli/Program.cs

@@ -11,7 +11,7 @@ namespace SAPTeam.EasySign.Cli
 {
     internal class Program
     {
-        public static Bundle Bundle { get; set; }
+        public static Bundle? Bundle { get; set; }
 
         static RootCommand GetCommands()
         {
@@ -132,6 +132,11 @@ static void InitBundle(string workingDirectory, string bundleName)
 
         static void Add()
         {
+            if (Bundle == null)
+            {
+                throw new ApplicationException("Bundle is not initialized");
+            }
+
             AnsiConsole.Status()
                 .AutoRefresh(true)
                 .Spinner(Spinner.Known.Default)
@@ -154,6 +159,11 @@ static void Add()
 
         static void Sign(X509Certificate2Collection certificates)
         {
+            if (Bundle == null)
+            {
+                throw new ApplicationException("Bundle is not initialized");
+            }
+
             AnsiConsole.Status()
                 .AutoRefresh(true)
                 .Spinner(Spinner.Known.Default)
@@ -200,6 +210,11 @@ static void Sign(X509Certificate2Collection certificates)
 
         private static bool VerifyCertificate(X509Certificate2 certificate)
         {
+            if (Bundle == null)
+            {
+                throw new ApplicationException("Bundle is not initialized");
+            }
+
             List<bool> verifyResults = new();
 
             var defaultVerification = Bundle.VerifyCertificate(certificate, out X509ChainStatus[] statuses);
@@ -239,6 +254,11 @@ private static void EnumerateStatuses(X509ChainStatus[] statuses)
 
         static void Verify()
         {
+            if (Bundle == null)
+            {
+                throw new ApplicationException("Bundle is not initialized");
+            }
+
             var colorDict = new Dictionary<string, Color>()
             {
                 ["file_verified"] = Color.MediumSpringGreen,
@@ -365,9 +385,10 @@ public static IEnumerable<string> SafeEnumerateFiles(string path, string searchP
 
             while (!folders.IsEmpty)
             {
-                folders.TryDequeue(out string currentDir);
-                string[] subDirs;
-                string[] files = null;
+                if (!folders.TryDequeue(out string? currentDir)) continue;
+
+                string[] subDirs = Array.Empty<string>();
+                string[] files = Array.Empty<string>();
 
                 try
                 {
@@ -376,12 +397,9 @@ public static IEnumerable<string> SafeEnumerateFiles(string path, string searchP
                 catch (UnauthorizedAccessException) { }
                 catch (DirectoryNotFoundException) { }
 
-                if (files != null)
+                foreach (string file in files)
                 {
-                    foreach (string file in files)
-                    {
-                        yield return file;
-                    }
+                    yield return file;
                 }
 
                 try

src/EasySign/Bundle.cs

@@ -19,7 +19,7 @@ namespace SAPTeam.EasySign
     public class Bundle
     {
         private readonly string bundleName = ".eSign";
-        private byte[] rawZipContents = null;
+        private byte[]? rawZipContents = null;
 
         /// <summary>
         /// Gets the root path of the bundle. This path used for relative path resolution.
@@ -90,7 +90,7 @@ public string BundleName
         /// <summary>
         /// Occurs when the bundle file is being updated.
         /// </summary>
-        public event Action<ZipArchive> OnUpdating;
+        public event Action<ZipArchive>? OnUpdating;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Bundle"/> class with the specified root path and bundle name.
@@ -132,7 +132,9 @@ public ZipArchive OpenZipArchive(ZipArchiveMode mode = ZipArchiveMode.Read)
 
             if (IsLoadedFromMemory)
             {
+#pragma warning disable CS8604 // Possible null reference argument.
                 var ms = new MemoryStream(rawZipContents);
+#pragma warning restore CS8604 // Possible null reference argument.
                 return new ZipArchive(ms, mode);
             }
             else
@@ -185,19 +187,19 @@ public void LoadFromBytes(byte[] bundleContent)
         /// <param name="zip">The <see cref="ZipArchive"/> to read from.</param>
         protected virtual void ReadBundle(ZipArchive zip)
         {
-            ZipArchiveEntry entry;
+            ZipArchiveEntry? entry;
             if ((entry = zip.GetEntry(".manifest.ec")) != null)
 #if NET6_0_OR_GREATER
-                Manifest = JsonSerializer.Deserialize(entry.Open(), typeof(Manifest), SourceGenerationManifestContext.Default) as Manifest;
+                Manifest = JsonSerializer.Deserialize(entry.Open(), typeof(Manifest), SourceGenerationManifestContext.Default) as Manifest ?? new Manifest();
 #else
-                Manifest = JsonSerializer.Deserialize<Manifest>(entry.Open(), SerializerOptions);
+                Manifest = JsonSerializer.Deserialize<Manifest>(entry.Open(), SerializerOptions) ?? new Manifest();;
 #endif
 
             if ((entry = zip.GetEntry(".signatures.ec")) != null)
 #if NET6_0_OR_GREATER
-                Signatures = JsonSerializer.Deserialize(entry.Open(), typeof(Signatures), SourceGenerationSignaturesContext.Default) as Signatures;
+                Signatures = JsonSerializer.Deserialize(entry.Open(), typeof(Signatures), SourceGenerationSignaturesContext.Default) as Signatures ?? new Signatures();
 #else
-                Signatures = JsonSerializer.Deserialize<Signatures>(entry.Open(), SerializerOptions);
+                Signatures = JsonSerializer.Deserialize<Signatures>(entry.Open(), SerializerOptions) ?? new Signatures();
 #endif
         }
 
@@ -209,7 +211,7 @@ protected virtual void ReadBundle(ZipArchive zip)
         /// <param name="path">The path of the file to add.</param>
         /// <param name="destinationPath">The destination path within the bundle. Ignore when <see cref="Manifest.StoreOriginalFiles"/> is <see langword="false"/></param>
         /// <param name="rootPath">The root path for relative paths.</param>
-        public void AddEntry(string path, string destinationPath = "./", string rootPath = null)
+        public void AddEntry(string path, string destinationPath = "./", string? rootPath = null)
         {
             EnsureWritable();
 
@@ -299,6 +301,8 @@ public bool VerifySignature(string certificateHash)
             X509Certificate2 certificate = GetCertificate(certificateHash);
             var pubKey = certificate.GetRSAPublicKey();
 
+            if (pubKey == null) return false;
+
 #if NET6_0_OR_GREATER
             var manifestData = Export(Manifest, SourceGenerationManifestContext.Default);
 #else
@@ -315,7 +319,7 @@ public bool VerifySignature(string certificateHash)
         /// <param name="statuses">The chain statuses of the certificate.</param>
         /// <param name="policy">The chain policy to use for verification.</param>
         /// <returns>True if the certificate is valid; otherwise, false.</returns>
-        public bool VerifyCertificate(string certificateHash, out X509ChainStatus[] statuses, X509ChainPolicy policy = null)
+        public bool VerifyCertificate(string certificateHash, out X509ChainStatus[] statuses, X509ChainPolicy? policy = null)
         {
             X509Certificate2 certificate = GetCertificate(certificateHash);
             return VerifyCertificate(certificate, out statuses, policy);
@@ -327,7 +331,7 @@ public bool VerifyCertificate(string certificateHash, out X509ChainStatus[] stat
         /// <param name="certificateHash">The hash of the certificate to verify.</param>
         /// <param name="policy">The chain policy to use for verification.</param>
         /// <returns>True if the certificate is valid; otherwise, false.</returns>
-        public bool VerifyCertificate(string certificateHash, X509ChainPolicy policy = null)
+        public bool VerifyCertificate(string certificateHash, X509ChainPolicy? policy = null)
         {
             return VerifyCertificate(certificateHash, out _, policy);
         }
@@ -339,7 +343,7 @@ public bool VerifyCertificate(string certificateHash, X509ChainPolicy policy = n
         /// <param name="statuses">The chain statuses of the certificate.</param>
         /// <param name="policy">The chain policy to use for verification.</param>
         /// <returns>True if the certificate is valid; otherwise, false.</returns>
-        public bool VerifyCertificate(X509Certificate2 certificate, out X509ChainStatus[] statuses, X509ChainPolicy policy = null)
+        public bool VerifyCertificate(X509Certificate2 certificate, out X509ChainStatus[] statuses, X509ChainPolicy? policy = null)
         {
             X509Chain chain = new X509Chain
             {
@@ -357,7 +361,7 @@ public bool VerifyCertificate(X509Certificate2 certificate, out X509ChainStatus[
         /// <param name="certificate">The certificate to verify.</param>
         /// <param name="policy">The chain policy to use for verification.</param>
         /// <returns>True if the certificate is valid; otherwise, false.</returns>
-        public bool VerifyCertificate(X509Certificate2 certificate, X509ChainPolicy policy = null)
+        public bool VerifyCertificate(X509Certificate2 certificate, X509ChainPolicy? policy = null)
         {
             return VerifyCertificate(certificate, out _, policy);
         }
@@ -369,7 +373,7 @@ public bool VerifyCertificate(X509Certificate2 certificate, X509ChainPolicy poli
         /// <returns>The certificate.</returns>
         public X509Certificate2 GetCertificate(string certificateHash)
         {
-            if (!certCache.TryGetValue(certificateHash, out X509Certificate2 certificate))
+            if (!certCache.TryGetValue(certificateHash, out X509Certificate2? certificate))
             {
                 using var zip = OpenZipArchive();
                 var certData = ReadEntry(zip, certificateHash);
@@ -389,7 +393,8 @@ public Stream GetFileStream(string entryName)
             if (Manifest.StoreOriginalFiles)
             {
                 using var zip = OpenZipArchive();
-                return zip.GetEntry(entryName).Open();
+                var entry = zip.GetEntry(entryName) ?? throw new FileNotFoundException("Entry not found", entryName);
+                return entry.Open();
             }
             else
             {
@@ -486,7 +491,8 @@ protected byte[] ReadEntry(ZipArchive zip, string entryName)
         {
             if (!fileCache.TryGetValue(entryName, out var data))
             {
-                using var stream = zip.GetEntry(entryName).Open();
+                var entry = zip.GetEntry(entryName) ?? throw new FileNotFoundException("Entry not found", entryName);
+                using var stream = entry.Open();
                 data = ReadStream(stream);
 
                 if (IsReadOnly)
@@ -517,14 +523,14 @@ private static byte[] ReadStream(Stream stream)
         /// <param name="data">The data to write.</param>
         protected void WriteEntry(ZipArchive zip, string entryName, byte[] data)
         {
-            ZipArchiveEntry tempEntry;
+            ZipArchiveEntry? tempEntry;
             if ((tempEntry = zip.GetEntry(entryName)) != null)
                 tempEntry.Delete();
 
 #if NET6_0_OR_GREATER
             ZipArchiveEntry entry = zip.CreateEntry(entryName, CompressionLevel.SmallestSize);
 #else
-                ZipArchiveEntry entry = zip.CreateEntry(entryName, CompressionLevel.Optimal);
+            ZipArchiveEntry entry = zip.CreateEntry(entryName, CompressionLevel.Optimal);
 #endif
 
             using var stream = entry.Open();