All but "SigningPackageTest.test(false, false, true, UNICODE_INDEX)" signing tests pass

Author: alexeysemenyukoracle

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java

@@ -32,11 +32,10 @@
 import jdk.jpackage.internal.model.MacApplication;
 import jdk.jpackage.internal.model.MacDmgPackage;
 import jdk.jpackage.internal.model.MacDmgPackageMixin;
-import jdk.jpackage.internal.model.MacPackage;
 
 final class MacDmgPackageBuilder {
 
-    MacDmgPackageBuilder(PackageBuilder pkgBuilder) {
+    MacDmgPackageBuilder(MacPackageBuilder pkgBuilder) {
         this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
     }
 
@@ -55,15 +54,16 @@ List<Path> validatedDmgContent() {
     }
 
     MacDmgPackage create() throws ConfigException {
-        pkgBuilder.installDir().ifPresent(installDir -> {
-            final var defaultInstallDirLocation = pkgBuilder.defaultInstallDir().map(Path::getParent).orElseThrow();
+        final var superPkgBuilder = pkgBuilder.pkgBuilder();
+        superPkgBuilder.installDir().ifPresent(installDir -> {
+            final var defaultInstallDirLocation = superPkgBuilder.defaultInstallDir().map(Path::getParent).orElseThrow();
             if (!defaultInstallDirLocation.equals(installDir)) {
                 Log.info(I18N.format("message.install-dir-ignored", defaultInstallDirLocation));
-                pkgBuilder.installDir(defaultInstallDirLocation);
+                superPkgBuilder.installDir(defaultInstallDirLocation);
             }
         });
 
-        final var pkg = MacPackage.create(pkgBuilder.create());
+        final var pkg = pkgBuilder.create();
 
         return MacDmgPackage.create(pkg, new MacDmgPackageMixin.Stub(
                 Optional.ofNullable(icon).or(((MacApplication)pkg.app())::icon),
@@ -72,5 +72,5 @@ MacDmgPackage create() throws ConfigException {
 
     private Path icon;
     private List<Path> dmgContent;
-    private final PackageBuilder pkgBuilder;
+    private final MacPackageBuilder pkgBuilder;
 }

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java

@@ -67,6 +67,7 @@
 import jdk.jpackage.internal.model.MacFileAssociation;
 import jdk.jpackage.internal.model.MacLauncher;
 import jdk.jpackage.internal.model.MacPkgPackage;
+import jdk.jpackage.internal.model.PackageType;
 import jdk.jpackage.internal.model.RuntimeLayout;
 
 
@@ -154,12 +155,25 @@ private static MacApplication createMacApplication(
         return appBuilder.create();
     }
 
+    private static MacPackageBuilder createMacPackageBuilder(
+            Map<String, ? super Object> params, MacApplication app,
+            PackageType type) throws ConfigException {
+        final var builder = new MacPackageBuilder(createPackageBuilder(params, app, type));
+
+        PREDEFINED_APP_IMAGE_FILE.findIn(params)
+                .map(MacAppImageFileExtras::new)
+                .map(MacAppImageFileExtras::signed)
+                .ifPresent(builder::predefinedAppImageSigned);
+
+        return builder;
+    }
+
     private static MacDmgPackage createMacDmgPackage(
             Map<String, ? super Object> params) throws ConfigException, IOException {
 
         final var app = APPLICATION.fetchFrom(params);
 
-        final var superPkgBuilder = createPackageBuilder(params, app, MAC_DMG);
+        final var superPkgBuilder = createMacPackageBuilder(params, app, MAC_DMG);
 
         final var pkgBuilder = new MacDmgPackageBuilder(superPkgBuilder);
 
@@ -173,7 +187,7 @@ private static MacPkgPackage createMacPkgPackage(
 
         final var app = APPLICATION.fetchFrom(params);
 
-        final var superPkgBuilder = createPackageBuilder(params, app, MAC_PKG);
+        final var superPkgBuilder = createMacPackageBuilder(params, app, MAC_PKG);
 
         final var pkgBuilder = new MacPkgPackageBuilder(superPkgBuilder);
 

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import java.util.Objects;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.MacPackage;
+import jdk.jpackage.internal.model.MacPackageMixin;
+
+final class MacPackageBuilder {
+
+    MacPackageBuilder(PackageBuilder pkgBuilder) {
+        this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
+    }
+
+    MacPackageBuilder predefinedAppImageSigned(boolean  v) {
+        predefinedAppImageSigned = v;
+        return this;
+    }
+
+    PackageBuilder pkgBuilder() {
+        return pkgBuilder;
+    }
+
+    MacPackage create() throws ConfigException {
+        final var pkg = pkgBuilder.create();
+        return MacPackage.create(pkg, new MacPackageMixin.Stub(pkg.predefinedAppImage().map(v -> predefinedAppImageSigned)));
+    }
+
+    private final PackageBuilder pkgBuilder;
+    private boolean predefinedAppImageSigned;
+}

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java

@@ -61,6 +61,7 @@
 import jdk.jpackage.internal.PackagingPipeline.TaskID;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.MacPackage;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.FileAssociation;
 import jdk.jpackage.internal.model.MacApplication;
@@ -164,7 +165,7 @@ static PackagingPipeline.Builder build(Optional<Package> pkg) {
                 disabledTasks.add(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT);
                 builder.task(MacCopyAppImageTaskID.REPLACE_APP_IMAGE_FILE).applicationAction(createWriteAppImageFileAction()).add();
                 builder.appImageLayoutForPackaging(Package::appImageLayout);
-            } else if (p.isRuntimeInstaller() || (p.predefinedAppImage().isPresent() && ((MacApplication)p.app()).sign())) {
+            } else if (p.isRuntimeInstaller() || ((MacPackage)p).predefinedAppImageSigned().orElse(false)) {
                 // If this is a runtime package or a signed predefined app image,
                 // don't create ".package" file and don't sign it.
                 disabledTasks.add(MacCopyAppImageTaskID.COPY_PACKAGE_FILE);

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java

@@ -27,14 +27,13 @@
 import java.util.Objects;
 import java.util.Optional;
 import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.MacPackage;
 import jdk.jpackage.internal.model.MacPkgPackage;
 import jdk.jpackage.internal.model.MacPkgPackageMixin;
 import jdk.jpackage.internal.model.SigningConfig;
 
 final class MacPkgPackageBuilder {
 
-    MacPkgPackageBuilder(PackageBuilder pkgBuilder) {
+    MacPkgPackageBuilder(MacPackageBuilder pkgBuilder) {
         this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
     }
 
@@ -44,8 +43,7 @@ MacPkgPackageBuilder signingBuilder(SigningConfigBuilder v) {
     }
 
     MacPkgPackage create() throws ConfigException {
-        return MacPkgPackage.create(MacPackage.create(pkgBuilder.create()),
-                new MacPkgPackageMixin.Stub(createSigningConfig()));
+        return MacPkgPackage.create(pkgBuilder.create(), new MacPkgPackageMixin.Stub(createSigningConfig()));
     }
 
     private Optional<SigningConfig> createSigningConfig() throws ConfigException {
@@ -56,6 +54,6 @@ private Optional<SigningConfig> createSigningConfig() throws ConfigException {
         }
     }
 
-    private final PackageBuilder pkgBuilder;
+    private final MacPackageBuilder pkgBuilder;
     private SigningConfigBuilder signingBuilder;
 }

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackage.java

@@ -27,7 +27,7 @@
 import java.nio.file.Path;
 import jdk.jpackage.internal.util.CompositeProxy;
 
-public interface MacPackage extends Package {
+public interface MacPackage extends Package, MacPackageMixin {
 
     @Override
     default AppImageLayout appImageLayout() {
@@ -42,8 +42,8 @@ default Path installDir() {
         return Path.of("/").resolve(relativeInstallDir());
     }
 
-    public static MacPackage create(Package pkg) {
-        return CompositeProxy.create(MacPackage.class, pkg);
+    public static MacPackage create(Package pkg, MacPackageMixin mixin) {
+        return CompositeProxy.create(MacPackage.class, pkg, mixin);
     }
 
     public final static RuntimeLayout RUNTIME_PACKAGE_LAYOUT = RuntimeLayout.create(Path.of("Contents/Home"));

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackageMixin.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.model;
+
+import java.util.Optional;
+
+public interface MacPackageMixin {
+
+    /**
+     * Gets sign status of the predefined app image.
+     * <p>
+     * Returns {@code Optional.of(Boolean.TRUE)} if the predefined app image is
+     * available and is signed.
+     * <p>
+     * Returns {@code Optional.of(Boolean.FALSE)} if the predefined app image is
+     * available and is unsigned.
+     * <p>
+     * Returns any empty {@link Optional} instance if the predefined app image is
+     * unavailable.
+     * 
+     * @return sign status of the predefined app image if any
+     */
+    Optional<Boolean> predefinedAppImageSigned();
+
+    record Stub(Optional<Boolean> predefinedAppImageSigned) implements MacPackageMixin {
+    }
+}

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackage.java

@@ -28,8 +28,13 @@
 
 public interface MacPkgPackage extends MacPackage, MacPkgPackageMixin {
 
+    /**
+     * Returns {@code true} if this PKG installer should be signed.
+     *
+     * @return {@code true} if this PKG installer should be signed
+     */
     default boolean sign() {
-        return signingConfig().flatMap(SigningConfig::identity).isPresent();
+        return signingConfig().isPresent();
     }
 
     public static MacPkgPackage create(MacPackage pkg, MacPkgPackageMixin mixin) {