8255947: [macos] Signed macOS jpackage app doesn't filter spurious '-psn' argument

Reviewed-by: herrick, asemenyuk

Author: Alexander Matveev

src/jdk.jpackage/linux/native/common/LinuxSysInfo.cpp

@@ -25,6 +25,7 @@
 
 #include <limits.h>
 #include <unistd.h>
+#include "UnixSysInfo.h"
 #include "FileUtils.h"
 #include "ErrorHandling.h"
 
@@ -42,4 +43,12 @@ tstring getProcessModulePath() {
     return tstring(buffer, len);
 }
 
+tstring_array getCommandArgs(CommandArgProgramNameMode progNameMode) {
+    tstring_array result;
+    for (int i = progNameMode == ExcludeProgramName ? 1 : 0; i < argc; i++) {
+        result.push_back(argv[i]);
+    }
+    return result;
+}
+
 } // end of namespace SysInfo

src/jdk.jpackage/macosx/native/common/MacSysInfo.cpp

@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <mach-o/dyld.h>
+#include "UnixSysInfo.h"
 #include "FileUtils.h"
 #include "ErrorHandling.h"
 
@@ -77,4 +78,16 @@ tstring getProcessModulePath() {
     return FileUtils::toAbsolutePath(reply);
 }
 
+tstring_array getCommandArgs(CommandArgProgramNameMode progNameMode) {
+    tstring_array result;
+    const tstring psnArgPrefix = "-psn_";
+    for (int i = progNameMode == ExcludeProgramName ? 1 : 0; i < argc; i++) {
+        const tstring arg = argv[i];
+        if (!tstrings::startsWith(arg, psnArgPrefix)) {
+            result.push_back(arg);
+        }
+    }
+    return result;
+}
+
 } // end of namespace SysInfo

src/jdk.jpackage/unix/native/common/UnixSysInfo.cpp

@@ -56,15 +56,6 @@ bool isEnvVariableSet(const tstring& name) {
 }
 
 
-tstring_array getCommandArgs(CommandArgProgramNameMode progNameMode) {
-    tstring_array result;
-    for (int i = progNameMode == ExcludeProgramName ? 1 : 0; i < argc; i++) {
-        result.push_back(argv[i]);
-    }
-    return result;
-}
-
-
 int argc = 0;
 char** argv = 0;
 

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java

@@ -397,9 +397,15 @@ public void executeAndVerifyOutput(String... args) {
             executeAndVerifyOutput(false, args);
         }
 
-        public void executeAndVerifyOutput(boolean removePath, String... args) {
-            getExecutor(args).dumpOutput().setRemovePath(removePath).execute();
+        public void executeAndVerifyOutput(boolean removePath,
+                List<String> launcherArgs, List<String> appArgs) {
+            getExecutor(launcherArgs.toArray(new String[0])).dumpOutput()
+                    .setRemovePath(removePath).execute();
+            Path outputFile = TKit.workDir().resolve(OUTPUT_FILENAME);
+            verifyOutputFile(outputFile, appArgs, params);
+        }
 
+        public void executeAndVerifyOutput(boolean removePath, String... args) {
             final List<String> launcherArgs = List.of(args);
             final List<String> appArgs;
             if (launcherArgs.isEmpty()) {
@@ -408,8 +414,7 @@ public void executeAndVerifyOutput(boolean removePath, String... args) {
                 appArgs = launcherArgs;
             }
 
-            Path outputFile = TKit.workDir().resolve(OUTPUT_FILENAME);
-            verifyOutputFile(outputFile, appArgs, params);
+            executeAndVerifyOutput(removePath, launcherArgs, appArgs);
         }
 
         public Executor.Result executeOnly(boolean removePath, String...args) {

test/jdk/tools/jpackage/macosx/ArgumentsFilteringTest.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2020, 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.
+ *
+ * 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.
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.ArrayList;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.HelloApp;
+import jdk.jpackage.test.Annotations.Test;
+
+/**
+ * Tests generation of app image and then launches app by passing -psn_1_1
+ * argument via command line and checks that -psn_1_1 is not passed to
+ * application. Second test app image is generated -psn_2_2 and then app is
+ * launched with -psn_1_1 and we should filter -psn_1_1 and keep -psn_2_2.
+ * See JDK-8255947.
+ */
+
+/*
+ * @test
+ * @summary jpackage with -psn
+ * @library ../helpers
+ * @build jdk.jpackage.test.*
+ * @modules jdk.jpackage/jdk.jpackage.internal
+ * @compile ArgumentsFilteringTest.java
+ * @requires (os.family == "mac")
+ * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=ArgumentsFilteringTest
+ */
+public class ArgumentsFilteringTest {
+
+    @Test
+    public void test1() {
+        JPackageCommand cmd = JPackageCommand.helloAppImage();
+        cmd.executeAndAssertHelloAppImageCreated();
+        Path launcherPath = cmd.appLauncherPath();
+        HelloApp.assertApp(launcherPath)
+                .executeAndVerifyOutput(false, List.of("-psn_1_1"),
+                        new ArrayList<>());
+    }
+
+    @Test
+    public void test2() {
+        JPackageCommand cmd = JPackageCommand.helloAppImage()
+                .addArguments("--arguments", "-psn_2_2");
+        cmd.executeAndAssertHelloAppImageCreated();
+        Path launcherPath = cmd.appLauncherPath();
+        HelloApp.assertApp(launcherPath)
+                .executeAndVerifyOutput(false, List.of("-psn_1_1"),
+                        List.of("-psn_2_2"));
+    }
+}