Tools: Windows code signing

cyanfish · Oct 4, 2024 · 53f58fb · 53f58fb
1 parent 439b51f
commit 53f58fb
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/NAPS2.Tools/Project/Packaging/InnoSetupPackager.cs b/NAPS2.Tools/Project/Packaging/InnoSetupPackager.cs
@@ -4,7 +4,7 @@ namespace NAPS2.Tools.Project.Packaging;
 
 public static class InnoSetupPackager
 {
-    public static void PackageExe(Func<PackageInfo> pkgInfoFunc)
+    public static void PackageExe(Func<PackageInfo> pkgInfoFunc, bool noSign)
     {
         Output.Verbose("Building binaries");
         Cli.Run("dotnet", "clean NAPS2.App.Worker -c Release");
@@ -15,6 +15,12 @@ public static void PackageExe(Func<PackageInfo> pkgInfoFunc)
         Cli.Run("dotnet", "publish NAPS2.App.Console -c Release /p:DebugType=None /p:DebugSymbols=false");
 
         var pkgInfo = pkgInfoFunc();
+        if (!noSign)
+        {
+            Output.Verbose("Signing contents");
+            WindowsSigning.SignContents(pkgInfo);
+        }
+
         var exePath = pkgInfo.GetPath("exe");
         Output.Info($"Packaging exe installer: {exePath}");
 
@@ -24,6 +30,12 @@ public static void PackageExe(Func<PackageInfo> pkgInfoFunc)
         var iscc = Environment.ExpandEnvironmentVariables("%PROGRAMFILES(X86)%/Inno Setup 6/iscc.exe");
         Cli.Run(iscc, $"\"{innoDefPath}\"");
 
+        if (!noSign)
+        {
+            Output.Verbose("Signing installer");
+            WindowsSigning.SignFile(exePath);
+        }
+
         Output.OperationEnd($"Packaged exe installer: {exePath}");
     }
 

diff --git a/NAPS2.Tools/Project/Packaging/PackageCommand.cs b/NAPS2.Tools/Project/Packaging/PackageCommand.cs
@@ -17,13 +17,13 @@ public int Run(PackageOptions opts)
             switch (target.Type)
             {
                 case PackageType.Exe:
-                    InnoSetupPackager.PackageExe(GetPackageInfoForConfig);
+                    InnoSetupPackager.PackageExe(GetPackageInfoForConfig, opts.NoSign);
                     break;
                 case PackageType.Msi:
-                    WixToolsetPackager.PackageMsi(GetPackageInfoForConfig);
+                    WixToolsetPackager.PackageMsi(GetPackageInfoForConfig, opts.NoSign);
                     break;
                 case PackageType.Zip:
-                    ZipArchivePackager.PackageZip(GetPackageInfoForConfig);
+                    ZipArchivePackager.PackageZip(GetPackageInfoForConfig, opts.NoSign);
                     break;
                 case PackageType.Deb:
                     DebPackager.PackageDeb(GetPackageInfoForConfig(), opts.NoSign);

diff --git a/NAPS2.Tools/Project/Packaging/WixToolsetPackager.cs b/NAPS2.Tools/Project/Packaging/WixToolsetPackager.cs
@@ -6,7 +6,7 @@ namespace NAPS2.Tools.Project.Packaging;
 
 public static class WixToolsetPackager
 {
-    public static void PackageMsi(Func<PackageInfo> pkgInfoFunc)
+    public static void PackageMsi(Func<PackageInfo> pkgInfoFunc, bool noSign)
     {
         Output.Verbose("Building binaries");
         Cli.Run("dotnet", "clean NAPS2.App.Worker -c Release");
@@ -17,6 +17,12 @@ public static void PackageMsi(Func<PackageInfo> pkgInfoFunc)
         Cli.Run("dotnet", "publish NAPS2.App.Console -c Release /p:DebugType=None /p:DebugSymbols=false /p:DefineConstants=MSI");
 
         var pkgInfo = pkgInfoFunc();
+        if (!noSign)
+        {
+            Output.Verbose("Signing contents");
+            WindowsSigning.SignContents(pkgInfo);
+        }
+
         var msiPath = pkgInfo.GetPath("msi");
         Output.Info($"Packaging msi installer: {msiPath}");
 
@@ -30,6 +36,13 @@ public static void PackageMsi(Func<PackageInfo> pkgInfoFunc)
 
         var light = Environment.ExpandEnvironmentVariables("%PROGRAMFILES(X86)%/WiX Toolset v3.11/bin/light.exe");
         Cli.Run(light, $"\"{wixobjPath}\" -spdb -ext WixUIExtension -o \"{msiPath}\"");
+
+        if (!noSign)
+        {
+            Output.Verbose("Signing installer");
+            WindowsSigning.SignFile(msiPath);
+        }
+
         Output.OperationEnd($"Packaged msi installer: {msiPath}");
     }
 

diff --git a/NAPS2.Tools/Project/Packaging/ZipArchivePackager.cs b/NAPS2.Tools/Project/Packaging/ZipArchivePackager.cs
@@ -4,7 +4,7 @@ namespace NAPS2.Tools.Project.Packaging;
 
 public static class ZipArchivePackager
 {
-    public static void PackageZip(Func<PackageInfo> pkgInfoFunc)
+    public static void PackageZip(Func<PackageInfo> pkgInfoFunc, bool noSign)
     {
         Output.Verbose("Building binaries");
         Cli.Run("dotnet", "clean NAPS2.App.Worker -c Release");
@@ -16,6 +16,12 @@ public static void PackageZip(Func<PackageInfo> pkgInfoFunc)
         Cli.Run("dotnet", "build NAPS2.App.PortableLauncher -c Release");
 
         var pkgInfo = pkgInfoFunc();
+        if (!noSign)
+        {
+            Output.Verbose("Signing contents");
+            WindowsSigning.SignContents(pkgInfo);
+        }
+
         var zipPath = pkgInfo.GetPath("zip");
         Output.Info($"Packaging zip archive: {zipPath}");