escape spaces in inherited agents and variables

Author: hcoles

pitest-entry/src/main/java/org/pitest/process/Java9Process.java

@@ -113,7 +113,7 @@ private List<String> createLaunchArgs(JavaAgent agentJarLocator, List<String> ar
 
         cmd.addAll(args);
 
-        addLaunchJavaAgents(cmd);
+        addLaunchJavaAgentsAndEnvironmentVariables(cmd);
 
         return cmd;
     }
@@ -136,17 +136,31 @@ private Path createArgsFile(List<String> cmd) {
     private static void addPITJavaAgent(JavaAgent agentJarLocator,
                                         List<String> cmd) {
         final Optional<String> jarLocation = agentJarLocator.getJarLocation();
-        jarLocation.ifPresent(l -> cmd.add("-javaagent:" + l));
+        jarLocation.ifPresent(l -> cmd.add("-javaagent:\"" + l + "\""));
     }
 
-    private static void addLaunchJavaAgents(List<String> cmd) {
+    private static void addLaunchJavaAgentsAndEnvironmentVariables(List<String> cmd) {
         RuntimeMXBean rt = ManagementFactory.getRuntimeMXBean();
         List<String> agents = rt.getInputArguments().stream()
                 .filter(isJavaAgentParam().or(isEnvironmentSetting()))
+                .map(Java9Process::escapeSpaces)
                 .collect(Collectors.toList());
         cmd.addAll(agents);
     }
 
+    static String escapeSpaces(String line) {
+        if (!line.contains(" ")) {
+            return line;
+        }
+        if (line.startsWith("-D")) {
+            return line.replace("=", "=\"") + "\"";
+        }
+        if (line.startsWith("-javaagent")) {
+            return line.replace("-javaagent:", "-javaagent:\"") + "\"";
+        }
+        return line;
+    }
+
     private static Predicate<String> isEnvironmentSetting() {
         return a -> a.startsWith("-D");
     }

pitest-entry/src/test/java/org/pitest/process/Java9ProcessTest.java

@@ -0,0 +1,32 @@
+package org.pitest.process;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class Java9ProcessTest {
+
+    @Test
+    public void escapesJavaAgentLinesWithSpaces() {
+        String actual = Java9Process.escapeSpaces("-javaagent:foo bar");
+        assertThat(actual).isEqualTo("-javaagent:\"foo bar\"");
+    }
+
+    @Test
+    public void doesntTouchAgentsWithNoSpaces() {
+        String actual = Java9Process.escapeSpaces("-javaagent:foobar");
+        assertThat(actual).isEqualTo("-javaagent:foobar");
+    }
+
+    @Test
+    public void escapesVariableWithSpaces() {
+        String actual = Java9Process.escapeSpaces("-Dthingy=foo bar");
+        assertThat(actual).isEqualTo("-Dthingy=\"foo bar\"");
+    }
+
+    @Test
+    public void doesntTouchVariablesWithoutSpaces() {
+        String actual = Java9Process.escapeSpaces("-Dthingy=foobar");
+        assertThat(actual).isEqualTo("-Dthingy=foobar");
+    }
+}