added windowssigner class to bypass signerhelper private-package accesibility and some refactoring

Author: fvarrui

build.gradle

@@ -42,15 +42,15 @@ dependencies {
 	implementation 'org.twdata.maven:mojo-executor:2.3.0'
 	implementation 'commons-io:commons-io:2.11.0'
 	implementation 'org.apache.commons:commons-lang3:3.9'
-	implementation 'org.apache.commons:commons-collections4:4.1'
+	implementation 'org.apache.commons:commons-collections4:4.3'
 	implementation 'org.apache.commons:commons-compress:1.21'
 	implementation 'org.apache.velocity:velocity-engine-core:2.3'
 	implementation 'org.vafer:jdeb:1.9'
 	implementation 'net.jsign:jsign-core:6.0'
 	implementation 'org.redline-rpm:redline:1.2.10'
 	implementation 'edu.sc.seis.launch4j:launch4j:3.0.5'
 
-	testImplementation 'junit:junit:4.12'
+	testImplementation 'junit:junit:4.13.1'
 
 	compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.0'
 
@@ -72,7 +72,7 @@ targetCompatibility = JavaVersion.VERSION_1_8
 
 compileJava.options.encoding = 'UTF-8'
 
-// supress javadoc warnings
+// suppress javadoc warnings
 javadoc.options.addStringOption('Xdoclint:none', '-quiet')
 
 java {
@@ -154,7 +154,8 @@ publishing {
 }
 
 // runs the plugin description generator
-task generatePluginDescriptor(type: JavaExec, dependsOn: compileJava) {
+tasks.register('generatePluginDescriptor', JavaExec) {
+	dependsOn compileJava
 	def pluginDescriptorFile = new File(project.compileJava.destinationDirectory.asFile.get(), 'META-INF/maven/plugin.xml')
 
 	// FIXME: this does not seem to be working
@@ -196,27 +197,27 @@ nexusStaging {
 	password = project.findProperty('ossrhPassword') ?: ''
 }
 
-task updateUniversalJavaApplicationStub(type : Download) {
+tasks.register('updateUniversalJavaApplicationStub', Download) {
 	def version = '20230601.235708'
 	group 'Update assets'
-	description 'Downloads compiled and scripted versions of universalJavaApplicationStub to src/main/resources/mac overriding the existing ones.'	
+	description 'Downloads compiled and scripted versions of universalJavaApplicationStub to src/main/resources/mac overriding the existing ones.'
 	src([
-		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.sh",
-		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.x86_64",
-		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.arm64",
-		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub"
+			"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.sh",
+			"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.x86_64",
+			"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.arm64",
+			"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub"
 	])
 	dest file('src/main/resources/mac')
-    overwrite true
+	overwrite true
 }
 
-task updateWhyJavaLauncher(type : Download) {
+tasks.register('updateWhyJavaLauncher', Download) {
 	def version = '1.1.2'
 	group 'Update assets'
-	description 'Downloads JavaLauncher.exe to src/main/resources/windows and overwrites the existing one.'	
+	description 'Downloads JavaLauncher.exe to src/main/resources/windows and overwrites the existing one.'
 	src([
-		"https://github.com/AstroImageJ/Why/releases/download/${version}/JavaLauncher.exe"
+			"https://github.com/AstroImageJ/Why/releases/download/${version}/JavaLauncher.exe"
 	])
 	dest file('src/main/resources/windows')
-    overwrite true
+	overwrite true
 }

src/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExeLaunch4j.java

@@ -4,6 +4,7 @@
 import java.util.HashSet;
 import java.util.List;
 
+import net.jsign.WindowsSigner;
 import org.apache.commons.lang3.StringUtils;
 
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
@@ -78,8 +79,6 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		l4jTask.getLanguage().set(winConfig.getLanguage());		
 		l4jTask.getActions().forEach(action -> action.execute(l4jTask));
 
-		sign(getGenericExe(), packager);
-
 		FileUtils.copyFileToFile(getGenericExe(), executable);
 
 		return createBootstrapScript(packager);

src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExeLaunch4j.java

@@ -14,6 +14,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import net.jsign.WindowsSigner;
 import org.apache.commons.lang3.StringUtils;
 import org.twdata.maven.mojoexecutor.MojoExecutor.Element;
 
@@ -66,11 +67,9 @@ protected File doApply(WindowsPackager packager) throws Exception {
 			FileUtils.copyFileToFolder(jarFile, appFolder);
 			jarPath = jarFile.getName();
 		}
-	
-		List<Element> optsElements = vmArgs.stream().map(arg -> element("opt", arg)).collect(Collectors.toList());
-		
-		List<Element> jreElements = new ArrayList<>();
-		jreElements.add(element("opts", optsElements.toArray(new Element[optsElements.size()])));
+
+        List<Element> jreElements = new ArrayList<>();
+		jreElements.add(element("opts", vmArgs.stream().map(arg -> element("opt", arg)).toArray(Element[]::new)));
 		jreElements.add(element("path", bundleJre ? jreDirectoryName : "%JAVA_HOME%;%PATH%"));
 		if (!StringUtils.isBlank(jreMinVersion)) {
 			jreElements.add(element("minVersion", jreMinVersion));
@@ -91,7 +90,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
 					)
 				);
 		pluginConfig.add(element("chdir", useResourcesAsWorkingDir ? "." : ""));		
-		pluginConfig.add(element("jre", jreElements.toArray(new Element[jreElements.size()])));
+		pluginConfig.add(element("jre", jreElements.toArray(new Element[0])));
 		pluginConfig.add(
 					element("versionInfo", 
 						element("fileVersion", winConfig.getFileVersion()),
@@ -119,11 +118,9 @@ protected File doApply(WindowsPackager packager) throws Exception {
 							version("2.4.1")
 					),
 					goal("launch4j"),
-					configuration(pluginConfig.toArray(new Element[pluginConfig.size()])),
+					configuration(pluginConfig.toArray(new Element[0])),
 					Context.getMavenContext().getEnv()
 				);
-			
-			sign(getGenericExe(), packager);
 
 			FileUtils.copyFileToFile(getGenericExe(), executable);
 

src/main/java/io/github/fvarrui/javapackager/packagers/AbstractCreateWindowsExe.java

@@ -7,9 +7,9 @@
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 
-public abstract class AbstractCreateWindowsExe extends WindowsArtifactGenerator {
+public abstract class AbstractCreateWindowsExe extends ArtifactGenerator<WindowsPackager> {
 
-	private File outputFolder;
+	private final File outputFolder;
 	private File genericManifest;
 	private File genericIcon;
 	private File genericJar;

src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java

@@ -20,7 +20,7 @@
 
 
 /**
- * Bundles a Java Runtime Enrironment (JRE) with the app
+ * Bundles a Java Runtime Environment (JRE) with the app
  */
 public class BundleJre extends ArtifactGenerator<Packager> {
 
@@ -139,7 +139,7 @@ protected File doApply(Packager packager) throws Exception {
 
 			// gets JDK release info 
 			Map<String,String> releaseMap = JDKUtils.getRelease(jdkPath);
-			String releaseInfo = "add:IMAGE_TYPE=\"JRE\":OS_ARCH=\"" + releaseMap.get("OS_ARCH") + "\":OS_NAME=" + releaseMap.get("OS_NAME") + "\"";
+			String releaseInfo = "add:IMAGE_TYPE=\"JRE\":OS_ARCH=\"" + releaseMap.get("OS_ARCH") + "\":OS_NAME=\"" + releaseMap.get("OS_NAME") + "\"";
 
 			// full path to jlink command
 			File jlink = new File(currentJdk, "/bin/jlink");
@@ -186,7 +186,7 @@ protected File doApply(Packager packager) throws Exception {
 		}
 
 		// updates bundle jre property value, as this artifact generator could disable this option 
-		// (e.g. when bundling a jre from a different platform than the current one)
+		// (e.g., when bundling a jre from a different platform than the current one)
 		packager.bundleJre(bundleJre);
 
 		return destinationFolder;

src/main/java/io/github/fvarrui/javapackager/packagers/CreateWindowsExeWhy.java

@@ -9,6 +9,7 @@
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.RcEdit;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
+import net.jsign.WindowsSigner;
 
 /**
  * Creates Windows executable with WinRun4j
@@ -78,9 +79,6 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		// copies ini file to app folder
 		FileUtils.copyFileToFolder(genericIni, appFolder);
 
-		// signs generated exe file
-		sign(getGenericExe(), packager);
-
 		// copies exe file to app folder with apps name
 		FileUtils.copyFileToFile(getGenericExe(), executable);
 

src/main/java/io/github/fvarrui/javapackager/packagers/CreateWindowsExeWinRun4j.java

@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import net.jsign.WindowsSigner;
 import org.apache.commons.lang3.StringUtils;
 
 import io.github.fvarrui.javapackager.model.Arch;
@@ -146,9 +147,6 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		File iniFile = new File(appFolder, name + ".ini");
 		FileUtils.copyFileToFile(genericIni, iniFile);
 
-		// signs generated exe file
-		sign(getGenericExe(), packager);
-
 		// copies exe file to app folder with apps name
 		FileUtils.copyFileToFile(getGenericExe(), executable);
 

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateMsi.java

@@ -8,12 +8,13 @@
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 import io.github.fvarrui.javapackager.utils.XMLUtils;
+import net.jsign.WindowsSigner;
 
 /**
- * Creates a MSI file including all app folder's content only for
+ * Creates an MSI file including all app folder's content only for
  * Windows so app could be easily distributed
  */
-public class GenerateMsi extends WindowsArtifactGenerator {
+public class GenerateMsi extends ArtifactGenerator<WindowsPackager> {
 
 	public GenerateMsi() {
 		super("MSI installer");
@@ -70,8 +71,8 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		}
 
 		// sign installer
-		sign(msiFile, packager);
-		
+		WindowsSigner.sign(msiFile, packager.getDisplayName(), packager.getUrl(), packager.getWinConfig().getSigning());
+
 		return msiFile;
 	}
 

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateMsm.java

@@ -9,10 +9,10 @@
 import io.github.fvarrui.javapackager.utils.XMLUtils;
 
 /**
- * Creates a MSI file including all app folder's content only for Windows so app
+ * Creates an MSI file including all app folder's content only for Windows so app
  * could be easily distributed
  */
-public class GenerateMsm extends WindowsArtifactGenerator {
+public class GenerateMsm extends ArtifactGenerator<WindowsPackager> {
 
 	public GenerateMsm() {
 		super("MSI merge module");
@@ -50,7 +50,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		VelocityUtils.render("windows/msm.wxs.vtl", wxsFile, packager);
 		Logger.info("WXS file generated in " + wxsFile + "!");
 
-		// pretiffy wxs
+		// prettify wxs
 		XMLUtils.prettify(wxsFile);
 
 		// candle wxs file

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateSetup.java

@@ -7,12 +7,13 @@
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
+import net.jsign.WindowsSigner;
 
 /**
  * Creates a Setup file including all app folder's content only for
  * Windows so app could be easily distributed
  */
-public class GenerateSetup extends WindowsArtifactGenerator {
+public class GenerateSetup extends ArtifactGenerator<WindowsPackager> {
 
 	public GenerateSetup() {
 		super("Setup installer");
@@ -49,7 +50,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		File issFile = new File(assetsFolder, name + ".iss");
 		VelocityUtils.render("windows/iss.vtl", issFile, packager);
 
-		// generates windows installer with inno setup command line compiler
+		// generates Windows installer with inno setup command line compiler
 		CommandUtils.execute("iscc", "/O" + outputDirectory.getAbsolutePath(), "/F" + name + "_" + version, issFile);
 
 		// setup file
@@ -59,8 +60,8 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		}
 
 		// sign installer
-		sign(setupFile, packager);
-		
+		WindowsSigner.sign(setupFile, packager.getDisplayName(), packager.getUrl(), packager.getWinConfig().getSigning());
+
 		return setupFile;
 	}