Fix for empty parameters (#76)

* Don't add empty parameters to container cmd * Set public version
tls-attacker · Jul 15, 2022 · 9b09379 · 9b09379
1 parent d15546d
commit 9b09379
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>TLS-Docker-Library</artifactId>
     <groupId>de.rub.nds.tlsdockerlib</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.0.1</version>
     <packaging>jar</packaging>
 
     <developers>

diff --git a/src/main/java/de/rub/nds/tls/subject/params/ParameterProfile.java b/src/main/java/de/rub/nds/tls/subject/params/ParameterProfile.java
@@ -96,19 +96,22 @@ public String[] toParameters(String host, Integer targetPort, ImageProperties im
         StringBuilder finalParams = new StringBuilder();
         for (Parameter param : parameterList) {
             if (supportsInsecure()) {
-                if (insecureConnection) {
-                    // do not add CA param if we use insecure
-                    if (param.getType() == ParameterType.CA_CERTIFICATE)
-                        continue;
-                } else {
-                    // do not add insecure if not wanted
-                    if (param.getType() == ParameterType.INSECURE)
-                        continue;
+                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 parallelize if not wanted
-            if (!parallelize && param.getType() == ParameterType.PARALLELIZE)
+
+            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(" ");
         }