Merge pull request #97 from tls-attacker/fix/npeEmptyParameters

Fixed NPE and empty pseudo-parameters

Author: mmaehren

src/main/java/de/rub/nds/tls/subject/docker/DockerTlsServerInstance.java

@@ -79,18 +79,16 @@ protected CreateContainerCmd prepareCreateContainerCmd(CreateContainerCmd cmd) {
         } else {
             host = hostInfo.getHostname();
         }
-        exposedImplementationPort =
-                new ExposedPort(hostInfo.getPort(), hostInfo.getType().toInternetProtocol());
-        return super.prepareCreateContainerCmd(cmd)
-                .withCmd(
-                        parameterProfile.toParameters(
-                                host,
-                                hostInfo.getPort(),
-                                imageProperties,
-                                additionalParameters,
-                                parallelize,
-                                insecureConnection))
+        exposedImplementationPort = new ExposedPort(hostInfo.getPort(), hostInfo.getType().toInternetProtocol());
+        String[] additionalCmds = parameterProfile.toParameters(host, hostInfo.getPort(), imageProperties,
+            additionalParameters, parallelize, insecureConnection);
+        if (additionalCmds.length > 0 && !additionalCmds[0].isEmpty()) {
+            return super.prepareCreateContainerCmd(cmd).withCmd(additionalCmds)
                 .withExposedPorts(exposedImplementationPort);
+        } else {
+            return super.prepareCreateContainerCmd(cmd).withExposedPorts(exposedImplementationPort);
+        }
+
     }
 
     @Override

src/main/java/de/rub/nds/tls/subject/params/ParameterProfile.java

@@ -114,26 +114,28 @@ public String[] toParameters(
             boolean parallelize,
             boolean insecureConnection) {
         StringBuilder finalParams = new StringBuilder();
-        for (Parameter param : parameterList) {
-            if (supportsInsecure()) {
-                if ((insecureConnection && param.getType() == ParameterType.CA_CERTIFICATE)
+        if (parameterList != null) {
+            for (Parameter param : parameterList) {
+                if (supportsInsecure()) {
+                    if ((insecureConnection && param.getType() == ParameterType.CA_CERTIFICATE)
                         || (!insecureConnection && param.getType() == ParameterType.INSECURE)) {
-                    // do not add CA param if we use insecure, do not add insecure
-                    // if not wanted
-                    continue;
+                        // do not add CA param if we use insecure, do not add insecure
+                        // if not wanted
+                        continue;
+                    }
                 }
-            }
 
-            if (!parallelize && param.getType() == ParameterType.PARALLELIZE) {
-                // do not add parallelize if not wanted
-                continue;
-            }
-            if (param.getCmdParameter().equals("")) {
-                // do not add empty commands that cause a blank space
-                continue;
+                if (!parallelize && param.getType() == ParameterType.PARALLELIZE) {
+                    // do not add parallelize if not wanted
+                    continue;
+                }
+                if (param.getCmdParameter().equals("")) {
+                    // do not add empty commands that cause a blank space
+                    continue;
+                }
+                finalParams.append(param.getCmdParameter());
+                finalParams.append(" ");
             }
-            finalParams.append(param.getCmdParameter());
-            finalParams.append(" ");
         }
         if (additionalParameters != null) {
             finalParams.append(additionalParameters);