Fix docker arguments management

Author: vfateev

openapi-plugin/src/main/java/com/xliic/openapi/platform/scan/ScanUtils.java

@@ -48,12 +48,6 @@ public class ScanUtils {
     private static final int PULL_SCAN_REPORT_DURATION = 10000;
     private static final int PULL_REPORT_DURATION = 60000;
 
-    @NotNull
-    public static String getCmdLine(@NotNull Map<String, String> env) {
-        return env.entrySet().stream().map(
-                e -> "-e " + e.getKey() + "=\"" + e.getValue() + "\"").collect(Collectors.joining(" "));
-    }
-
     @NotNull
     public static String getTempAPI(@NotNull Project project, @NotNull String oas, @NotNull ProgressIndicator progressIndicator) throws Exception {
         progressIndicator.setText("Creating temporary platform API");

openapi-plugin/src/main/java/com/xliic/openapi/platform/scan/task/ScanDockerTask.java

@@ -1,9 +1,11 @@
 package com.xliic.openapi.platform.scan.task;
 
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import com.xliic.core.ide.util.PropertiesComponent;
@@ -65,6 +67,13 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
                 callback.setRejected("Scan image is not available");
                 return;
             }
+            String dockerCmd = PropertiesComponent.getInstance().getValue(Settings.Platform.Scan.DOCKER_HOME);
+            if (StringUtils.isEmpty(dockerCmd)) {
+                dockerCmd = "docker";
+            } else {
+                boolean endsWithSeparator = dockerCmd.endsWith("/") || dockerCmd.endsWith("\\\\");
+                dockerCmd = dockerCmd + (endsWithSeparator ? "" : "/") + "docker";
+            }
             ScanService scanService = ScanService.getInstance(project);
             Environment myEnv = scanService.loadEnv();
             Map<String, String> dockerEnv = new HashMap<>();
@@ -74,9 +83,17 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
             dockerEnv.put("SCAN_TOKEN", token);
             dockerEnv.put("PLATFORM_SERVICE", ScanUtils.getServices());
 
-            String dockerArgs = ScanUtils.getCmdLine(dockerEnv);
+            List<String> cmdList = new LinkedList<>();
+            cmdList.add(dockerCmd);
+            cmdList.add("run");
+            cmdList.add("--rm");
+            for (Map.Entry<String, String> e : dockerEnv.entrySet()) {
+                cmdList.add("-e");
+                cmdList.add(e.getKey() + "=" + e.getValue());
+            }
+            cmdList.add(image);
             TerminalService terminalService = TerminalService.getInstance(project);
-            terminalService.sendText(ScanService.TERMINAL_TAB, "docker run --rm " + dockerArgs + " " + image);
+            terminalService.sendText(ScanService.TERMINAL_TAB, cmdList);
 
             progressIndicator.setText("Waiting for scan report");
             String reportId = ScanUtils.waitForScanReport(apiId);

openapi-plugin/src/main/java/com/xliic/openapi/services/TerminalService.java

@@ -2,6 +2,7 @@
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.util.List;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -22,16 +23,9 @@ public static TerminalService getInstance(@NotNull Project project) {
         return project.getService(TerminalService.class);
     }
 
-    public void sendTextQuietly(@NotNull String tabName, @NotNull String command) {
-        try {
-            sendText(tabName, command);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void sendText(@NotNull String tabName, @NotNull String command) throws Exception {
-        Process process = Runtime.getRuntime().exec(command);
+    public void sendText(@NotNull String tabName, @NotNull List<String> cmdList) throws Exception {
+        String cmdArray[] = new String[cmdList.size()];
+        Process process = Runtime.getRuntime().exec(cmdList.toArray(cmdArray));
         int exitCode = process.waitFor();
         if (exitCode != 0) {
             String result = new BufferedReader(new InputStreamReader(process.getErrorStream())).readLine();

openapi-plugin/src/main/java/com/xliic/openapi/settings/Settings.java

@@ -19,6 +19,7 @@
 import com.xliic.core.credentialStore.CredentialAttributes;
 import com.xliic.core.credentialStore.CredentialAttributesKt;
 import com.xliic.core.ide.util.PropertiesComponent;
+import com.xliic.core.util.SystemInfoRt;
 import com.xliic.openapi.platform.PlatformConnection;
 
 public class Settings {
@@ -59,6 +60,7 @@ public static class Scan {
 
             public static final String IMAGE = "com.xliic.openapi.settings.platform.scan.image";
             public static final String SERVICES = "com.xliic.openapi.settings.platform.scan.services";
+            public static final String DOCKER_HOME = "com.xliic.openapi.settings.platform.scan.docker.cmd";
             public static final String ENV_DEFAULT_KEY = "com.xliic.openapi.settings.platform.scan.default.env";
             public static final String ENV_SECRETS_KEY = "com.xliic.openapi.settings.platform.scan.secrets.env";
 
@@ -71,6 +73,9 @@ public static void init() {
                 if (!settings.isValueSet(SERVICES)) {
                     settings.setValue(SERVICES, "");
                 }
+                if (!settings.isValueSet(DOCKER_HOME)) {
+                    settings.setValue(DOCKER_HOME, SystemInfoRt.isWindows ? "" : "/usr/local/bin");
+                }
             }
         }
     }

openapi-plugin/src/main/java/com/xliic/openapi/settings/SettingsConfigurable.java

@@ -33,6 +33,7 @@
 import com.xliic.core.ui.components.JPanel;
 import com.xliic.core.ui.components.JTextArea;
 import com.xliic.core.ui.components.JTextField;
+import com.xliic.core.util.SystemInfoRt;
 import com.xliic.openapi.OpenApiBundle;
 import com.xliic.openapi.settings.Settings.Audit;
 import com.xliic.openapi.settings.Settings.ExtRef;
@@ -65,6 +66,7 @@ public class SettingsConfigurable extends SearchableConfigurable implements Conf
     private JPanel platformScanPanel;
     private JTextField platformScanImage;
     private JTextField platformScanServices;
+    private JTextField platformDockerHome;
 
     // Data dictionary
     private JPanel dictPanel;
@@ -128,6 +130,11 @@ protected Control createContents(Composite parent) {
         platformScanServices.setToolTipText("Format hostname:port");
         items.add(new ItemTextField(platformScanImage, Scan.IMAGE));
         items.add(new ItemTextField(platformScanServices, Scan.SERVICES));
+        if (!SystemInfoRt.isWindows) {
+            new Label(platformScanPanel.getComposite(), SWT.NULL).setText("Docker home");
+            platformDockerHome = new JTextField(platformScanPanel);
+            items.add(new ItemTextField(platformDockerHome, Scan.DOCKER_HOME));
+        }
 
         dictPanel = new JPanel("Data Dictionary", parent, SWT.NONE, 2);
         new Label(dictPanel.getComposite(), SWT.NULL).setText("Update document to match Data Dictionary definitions before runing Security Audit");