Merge pull request #63 from tls-attacker/imageProperties

Start container with specific name

Author: mmaehren

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

@@ -33,11 +33,11 @@ public class DockerTlsClientInstance extends DockerTlsInstance {
     private final boolean connectOnStartup;
 
     // TODO move away from HostInfo for client...
-    public DockerTlsClientInstance(ParameterProfile profile, ImageProperties imageProperties, String version,
+    public DockerTlsClientInstance(String containerName, ParameterProfile profile, ImageProperties imageProperties, String version,
             boolean autoRemove, HostInfo hostInfo, String additionalParameters, boolean parallelize,
             boolean insecureConnection, boolean connectOnStartup,
             UnaryOperator<HostConfig> hostConfigHook) {
-        super(profile, imageProperties, version, ConnectionRole.CLIENT, autoRemove, hostConfigHook);
+        super(containerName, profile, imageProperties, version, ConnectionRole.CLIENT, autoRemove, hostConfigHook);
         this.hostInfo = hostInfo;
         this.additionalParameters = additionalParameters;
         this.parallelize = parallelize;

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

@@ -35,6 +35,7 @@ public abstract class DockerTlsInstance {
     protected static final DockerClient DOCKER = DockerClientManager.getDockerClient();
     private static final Logger LOGGER = LogManager.getLogger();
 
+    private final String containerName;
     private String containerId;
     protected final Image image;
     private Optional<Long> exitCode = Optional.empty();
@@ -45,7 +46,7 @@ public abstract class DockerTlsInstance {
     protected List<DockerExecInstance> childExecs = new LinkedList<>();
     private final UnaryOperator<HostConfig> hostConfigHook;
 
-    public DockerTlsInstance(ParameterProfile profile, ImageProperties imageProperties,
+    public DockerTlsInstance(String containerName, ParameterProfile profile, ImageProperties imageProperties,
             String version, ConnectionRole role, boolean autoRemove,
             UnaryOperator<HostConfig> hostConfigHook) {
         if (profile == null) {
@@ -57,7 +58,8 @@ public DockerTlsInstance(ParameterProfile profile, ImageProperties imageProperti
         this.autoRemove = autoRemove;
         this.parameterProfile = profile;
         this.imageProperties = imageProperties;
-        this.hostConfigHook = hostConfigHook;
+        this.hostConfigHook = hostConfigHook;  
+        this.containerName = containerName;
         Map<String, String> labels = new HashMap<>();
         labels.put(TlsImageLabels.IMPLEMENTATION.getLabelName(), profile.getType().name().toLowerCase());
         labels.put(TlsImageLabels.VERSION.getLabelName(), version);
@@ -106,6 +108,9 @@ protected String createContainer() {
         @SuppressWarnings("squid:S2095") // sonarlint: Resources should be closed
         // Create container does not need to be closed
         CreateContainerCmd containerCmd = DOCKER.createContainerCmd(image.getId());
+        if(containerName != null) {
+            containerCmd.withName(containerName);
+        }
         containerCmd = prepareCreateContainerCmd(containerCmd);
         CreateContainerResponse container = containerCmd.exec();
         String[] warnings = container.getWarnings();
@@ -248,4 +253,8 @@ public long getExitCode() {
         }
         return exitCode.get();
     }
+    
+    public String getContainerName() {
+        return containerName;
+    }
 }

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

@@ -53,6 +53,7 @@ public abstract static class TlsInstanceBuilder<T extends TlsInstanceBuilder<T>>
         protected String additionalParameters = null;
         protected boolean parallelize = false;
         protected boolean insecureConnection = false;
+        protected String containerName;
 
         public TlsInstanceBuilder(TlsImplementationType type, String version, ConnectionRole role, TransportType transportType) {
             this.profile = retrieveParameterProfile(type, version, role);
@@ -75,6 +76,12 @@ public T hostname(String value) {
             hostname = value;
             return (T) this;
         }
+        
+        public T containerName(String value){
+            containerName = value;
+            return (T) this;
+        }
+                
 
         public T port(int value) {
             port = value;
@@ -114,7 +121,7 @@ public TlsClientInstanceBuilder(TlsImplementationType type, String version, Tran
 
         @Override
         public DockerTlsClientInstance build() throws DockerException, InterruptedException {
-            return new DockerTlsClientInstance(profile, imageProperties, version, autoRemove, new HostInfo(ip, hostname, port, transportType), additionalParameters, parallelize, insecureConnection,
+            return new DockerTlsClientInstance(containerName, profile, imageProperties, version, autoRemove, new HostInfo(ip, hostname, port, transportType), additionalParameters, parallelize, insecureConnection,
                     connectOnStartup, hostConfigHook);
         }
 
@@ -133,7 +140,7 @@ public TlsServerInstanceBuilder(TlsImplementationType type, String version, Tran
 
         @Override
         public DockerTlsServerInstance build() throws DockerException, InterruptedException {
-            return new DockerTlsServerInstance(profile, imageProperties, version, autoRemove, new HostInfo(ip, hostname, port, transportType), additionalParameters, parallelize, insecureConnection,
+            return new DockerTlsServerInstance(containerName, profile, imageProperties, version, autoRemove, new HostInfo(ip, hostname, port, transportType), additionalParameters, parallelize, insecureConnection,
                     hostConfigHook);
         }
 

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

@@ -14,6 +14,9 @@
 import de.rub.nds.tls.subject.HostInfo;
 import de.rub.nds.tls.subject.params.ParameterProfile;
 import de.rub.nds.tls.subject.properties.ImageProperties;
+import static java.lang.Thread.sleep;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class DockerTlsServerInstance extends DockerTlsInstance {
 
@@ -23,10 +26,10 @@ public class DockerTlsServerInstance extends DockerTlsInstance {
     private final boolean parallelize;
     private final boolean insecureConnection;
 
-    public DockerTlsServerInstance(ParameterProfile profile, ImageProperties imageProperties, String version, boolean autoRemove, HostInfo hostInfo, String additionalParameters, boolean parallelize,
+    public DockerTlsServerInstance(String containerName, ParameterProfile profile, ImageProperties imageProperties, String version, boolean autoRemove, HostInfo hostInfo, String additionalParameters, boolean parallelize,
             boolean insecureConnection,
             UnaryOperator<HostConfig> hostConfigHook) {
-        super(profile, imageProperties, version, ConnectionRole.SERVER, autoRemove, hostConfigHook);
+        super(containerName, profile, imageProperties, version, ConnectionRole.SERVER, autoRemove, hostConfigHook);
         this.port = hostInfo.getPort(); // fill with default port
         this.hostInfo = hostInfo;
         this.additionalParameters = additionalParameters;
@@ -64,16 +67,7 @@ public void start() {
      * Update port to match actually exposed port.
      */
     public void updateInstancePort() {
-        InspectContainerResponse containerInfo = DOCKER.inspectContainerCmd(getId()).exec();
-        if (containerInfo == null) {
-            throw new IllegalStateException("Could not find container with ID:" + getId());
-        }
-        NetworkSettings networkSettings = containerInfo.getNetworkSettings();
-        if (networkSettings == null) {
-            throw new IllegalStateException("Cannot retrieve InstacePort, Network not properly configured for container with ID:" + getId());
-        }
-        // TODO: ignore other exposed ports
-        port = new Integer(networkSettings.getPorts().getBindings().values().iterator().next()[0].getHostPortSpec());
+        port = imageProperties.getInternalPort();
     }
 
     public int getPort() {