Merge pull request wildfly#17258 from jamezp/WFLY-18602

[WFLY-18602] Add security manager testing support for script tests

Author: bstansberry

ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.bat

@@ -116,6 +116,11 @@ if "x%JBOSS_MODULEPATH%" == "x" (
   set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
 )
 
+setlocal EnableDelayedExpansion
+call "!DIRNAME!common.bat" :setSecurityManagerDefault
+set "JAVA_OPTS=!JAVA_OPTS! !SECURITY_MANAGER_CONFIG_OPTION!"
+setlocal DisableDelayedExpansion
+
 rem Set the module options
 set "MODULE_OPTS="
 if "%SECMGR%" == "true" (

ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.sh

@@ -142,11 +142,18 @@ if $cygwin; then
     JBOSS_MODULEPATH=`cygpath --path --windows "$JBOSS_MODULEPATH"`
 fi
 
+# Set default Security Manager configuration value
+setSecurityManagerDefault
+JAVA_OPTS="$JAVA_OPTS $SECURITY_MANAGER_CONFIG_OPTION"
+
 # Process the JAVA_OPTS failing if the java.security.manager is set.
 SECURITY_MANAGER_SET=`echo $JAVA_OPTS | $GREP "java\.security\.manager"`
 if [ "x$SECURITY_MANAGER_SET" != "x" ]; then
-    echo "ERROR: The use of -Djava.security.manager has been removed. Please use the -secmgr command line argument or SECMGR=true environment variable."
-    exit 1
+    SECURITY_MANAGER_SET_TO_ALLOW=`echo $JAVA_OPTS | $GREP "java\.security\.manager=allow"`
+    if [ "x$SECURITY_MANAGER_SET_TO_ALLOW" = "x" ]; then
+        echo "ERROR: The use of -Djava.security.manager has been removed. Please use the -secmgr command line argument or SECMGR=true environment variable."
+        exit 1
+    fi
 fi
 
 # Set up the module arguments

testsuite/scripts/src/test/java/org/wildfly/test/scripts/AppClientScriptTestCase.java

@@ -22,20 +22,29 @@ public AppClientScriptTestCase() {
 
     @Override
     void testScript(final ScriptProcess script) throws InterruptedException, TimeoutException, IOException {
+        // First check the standard script
         script.start(MAVEN_JAVA_OPTS, "-v");
-        Assert.assertNotNull("The process is null and may have failed to start.", script);
+        testScript(script, 0);
 
-        validateProcess(script);
+        // Test with the security manager enabled
+        script.start(MAVEN_JAVA_OPTS, "-v", "-secmgr");
+        testScript(script, jvmVersion() >= 17 ? 4 : 0);
+    }
+
+    private void testScript(final ScriptProcess script, final int additionalLines) throws InterruptedException, IOException {
+        try (script) {
+            validateProcess(script);
 
-        final List<String> lines = script.getStdout();
-        int count = 2;
-        for (String stdout : lines) {
-            if (stdout.startsWith("Picked up")) {
-                count += 1;
+            final List<String> lines = script.getStdout();
+            int count = 2 + additionalLines;
+            for (String stdout : lines) {
+                if (stdout.startsWith("Picked up")) {
+                    count += 1;
+                }
             }
+            final int expectedLines = (script.getShell() == Shell.BATCH ? 3 + additionalLines : count);
+            Assert.assertEquals(script.getErrorMessage(String.format("Expected %d lines.", expectedLines)), expectedLines,
+                    lines.size());
         }
-        final int expectedLines = (script.getShell() == Shell.BATCH ? 3 : count );
-        Assert.assertEquals(script.getErrorMessage(String.format("Expected %d lines.", expectedLines)), expectedLines,
-                lines.size());
     }
 }

testsuite/scripts/src/test/java/org/wildfly/test/scripts/ScriptProcess.java

@@ -6,8 +6,6 @@
 package org.wildfly.test.scripts;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -20,14 +18,17 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
+import java.util.stream.Stream;
 
 import org.jboss.as.controller.client.ModelControllerClient;
 import org.jboss.as.test.shared.TestSuiteEnvironment;
@@ -38,7 +39,7 @@
  *
  * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
  */
-public class ScriptProcess extends Process implements AutoCloseable {
+public class ScriptProcess implements AutoCloseable, ProcessHandle {
     private static final Logger LOGGER = Logger.getLogger(ScriptProcess.class);
 
     private static final Path PROC_DIR;
@@ -59,6 +60,7 @@ public class ScriptProcess extends Process implements AutoCloseable {
     private final long timeout;
     private final Collection<String> prefixCmds;
     private Process delegate;
+    private ProcessHandle handleDelegate;
     private Path stdoutLog;
     private String lastExecutedCmd;
 
@@ -107,6 +109,7 @@ void start(final Function<ModelControllerClient, Boolean> check, final Map<Strin
             waitFor(process, check);
         }
         this.delegate = process;
+        this.handleDelegate = process.toHandle();
     }
 
     @SuppressWarnings("unused")
@@ -170,64 +173,89 @@ public void close() {
     }
 
     @Override
-    public OutputStream getOutputStream() {
+    public long pid() {
         checkStatus();
-        return delegate.getOutputStream();
+        return handleDelegate.pid();
     }
 
     @Override
-    public InputStream getInputStream() {
+    public Optional<ProcessHandle> parent() {
         checkStatus();
-        return delegate.getInputStream();
+        return handleDelegate.parent();
     }
 
     @Override
-    public InputStream getErrorStream() {
+    public Stream<ProcessHandle> children() {
         checkStatus();
-        return delegate.getErrorStream();
+        return handleDelegate.children();
     }
 
     @Override
-    public int waitFor() throws InterruptedException {
+    public Stream<ProcessHandle> descendants() {
         checkStatus();
-        return delegate.waitFor();
+        return handleDelegate.children();
     }
 
     @Override
-    public boolean waitFor(final long timeout, final TimeUnit unit) throws InterruptedException {
+    public Info info() {
         checkStatus();
-        return delegate.waitFor(timeout, unit);
+        return handleDelegate.info();
     }
 
     @Override
-    public int exitValue() {
+    public CompletableFuture<ProcessHandle> onExit() {
         checkStatus();
-        return delegate.exitValue();
+        return handleDelegate.onExit();
     }
 
     @Override
-    public void destroy() {
+    public boolean supportsNormalTermination() {
         checkStatus();
-        delegate.destroy();
+        return handleDelegate.supportsNormalTermination();
+    }
+
+    @Override
+    public boolean destroy() {
+        if (handleDelegate != null) {
+            return handleDelegate.destroy();
+        }
+        return false;
+    }
+
+    @Override
+    public boolean destroyForcibly() {
+        if (handleDelegate != null) {
+            return handleDelegate.destroyForcibly();
+        }
+        return false;
     }
 
     @Override
-    public Process destroyForcibly() {
+    public int compareTo(final ProcessHandle other) {
         checkStatus();
-        return delegate.destroyForcibly();
+        return handleDelegate.compareTo(other);
     }
 
     @Override
     public boolean isAlive() {
-        checkStatus();
-        return delegate.isAlive();
+        return delegate != null && delegate.isAlive();
     }
 
     @Override
     public String toString() {
         return getCommandString(Collections.emptyList());
     }
 
+    boolean waitFor(final long timeout, final TimeUnit unit) throws InterruptedException {
+        checkStatus();
+        return delegate.waitFor(timeout, unit);
+    }
+
+    int exitValue() {
+        checkStatus();
+        return delegate.exitValue();
+    }
+
     private String getCommandString(final Collection<String> arguments) {
         final List<String> cmd = getCommand(arguments);
         final StringBuilder result = new StringBuilder();
@@ -242,7 +270,7 @@ private String getCommandString(final Collection<String> arguments) {
     }
 
     private void checkStatus() {
-        if (delegate == null) {
+        if (delegate == null || handleDelegate == null) {
             throw new IllegalStateException("The script has not yet been started.");
         }
     }

testsuite/scripts/src/test/java/org/wildfly/test/scripts/ScriptTestCase.java

@@ -132,6 +132,15 @@ void validateProcess(final ScriptProcess script) throws InterruptedException {
         }
     }
 
+    /**
+     * Returns the currently running JVM version.
+     *
+     * @return the JVM version
+     */
+    int jvmVersion() {
+        return Integer.parseInt(System.getProperty("java.vm.specification.version"));
+    }
+
     private void executeTests(final Shell shell) throws InterruptedException, IOException, TimeoutException {
         for (Path path : ServerConfigurator.PATHS) {
             try (ScriptProcess script = new ScriptProcess(path, scriptBaseName, shell, ServerHelper.TIMEOUT)) {