Fix #33752: do not use protocol of docker.url as target protocol

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java

@@ -38,6 +38,10 @@
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,6 +56,7 @@ public abstract class AbstractDockerBackend extends AbstractContainerBackend {
 
     protected static final String PROPERTY_PORT_RANGE_START = "port-range-start";
     protected static final String PROPERTY_PORT_RANGE_MAX = "port-range-max";
+    protected static final String PROPERTY_TARGET_URL = "target-url";
     protected static final String DEFAULT_TARGET_URL = DEFAULT_TARGET_PROTOCOL + "://localhost";
     private static final String PROPERTY_PREFIX = "proxy.docker.";
     @Inject
@@ -60,6 +65,8 @@ public abstract class AbstractDockerBackend extends AbstractContainerBackend {
 
     protected Integer portRangeFrom;
     protected Integer portRangeTo;
+    protected String nonInternalNetworkTargetProtocol;
+    protected URL nonInternalNetworkTargetURL;
 
     private final ScheduledExecutorService releasePortExecutor = Executors.newSingleThreadScheduledExecutor();
     private final ObjectMapper objectMapper = new ObjectMapper();
@@ -88,14 +95,21 @@ public void initialize() throws ContainerProxyException {
         }
 
         String confUrl = getProperty(PROPERTY_URL);
-        if (confUrl != null) builder.uri(confUrl);
+        if (confUrl != null) {
+            builder.uri(confUrl);
+        }
 
         dockerClient = builder.build();
         portRangeFrom = environment.getProperty(getPropertyPrefix() + PROPERTY_PORT_RANGE_START, Integer.class, 20000);
         portRangeTo = environment.getProperty(getPropertyPrefix() + PROPERTY_PORT_RANGE_MAX, Integer.class, -1);
-    }
-
 
+        try {
+            nonInternalNetworkTargetURL = new URI(getProperty(PROPERTY_TARGET_URL, DEFAULT_TARGET_URL)).toURL();
+            nonInternalNetworkTargetProtocol = getProperty(PROPERTY_CONTAINER_PROTOCOL, nonInternalNetworkTargetURL.getProtocol());
+        } catch (MalformedURLException | URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     @Override
     protected String getPropertyPrefix() {

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java

@@ -60,9 +60,7 @@
 import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URL;
 import java.nio.channels.ClosedChannelException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -81,8 +79,6 @@ public class DockerEngineBackend extends AbstractDockerBackend {
     private static final String PROPERTY_LOKI_URL = "loki-url";
 
     private ImagePullPolicy imagePullPolicy;
-    private String nonInternalNetworkTargetProtocol;
-    private URL hostURL;
     private String containerNetwork;
     private String lokiUrl;
 
@@ -92,13 +88,6 @@ public void initialize() {
         imagePullPolicy = environment.getProperty(getPropertyPrefix() + PROPERTY_IMG_PULL_POLICY, ImagePullPolicy.class, ImagePullPolicy.IfNotPresent);
         containerNetwork = environment.getProperty(getPropertyPrefix() + PROPERTY_CONTAINER_NETWORK);
         lokiUrl = environment.getProperty(getPropertyPrefix() + PROPERTY_LOKI_URL);
-
-        try {
-            hostURL = new URL(getProperty(PROPERTY_URL, DEFAULT_TARGET_URL));
-            nonInternalNetworkTargetProtocol = getProperty(PROPERTY_CONTAINER_PROTOCOL, hostURL.getProtocol());
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     @Override
@@ -228,7 +217,7 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
     protected URI calculateTarget(Container container, PortMappings.PortMappingEntry portMapping, Integer hostPort) throws Exception {
         String targetProtocol;
         String targetHostName;
-        String targetPort;
+        int targetPort;
 
         if (isUseInternalNetwork()) {
             targetProtocol = getDefaultTargetProtocol();
@@ -238,11 +227,11 @@ protected URI calculateTarget(Container container, PortMappings.PortMappingEntry
             ContainerInfo info = dockerClient.inspectContainer(container.getId());
             targetHostName = info.config().hostname();
 
-            targetPort = String.valueOf(portMapping.getPort());
+            targetPort = portMapping.getPort();
         } else {
             targetProtocol = nonInternalNetworkTargetProtocol;
-            targetHostName = hostURL.getHost();
-            targetPort = String.valueOf(hostPort);
+            targetHostName = nonInternalNetworkTargetURL.getHost();
+            targetPort = hostPort;
         }
         return new URI(String.format("%s://%s:%s%s", targetProtocol, targetHostName, targetPort, portMapping.getTargetPath()));
     }

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java

@@ -68,7 +68,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.channels.ClosedChannelException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -82,8 +81,6 @@
 @ConditionalOnProperty(name = "proxy.container-backend", havingValue = "docker-swarm")
 public class DockerSwarmBackend extends AbstractDockerBackend {
 
-    private URI hostURL;
-
     private int serviceWaitTime;
 
     private static final List<String> STARTING_STATES = List.of("new", "pending", "assigned", "accepted", "ready", "preparing", "starting", "running");
@@ -97,11 +94,6 @@ public void initialize() {
         } catch (Exception e) {
         }
         if (swarmId == null) throw new ContainerProxyException("Backend is not a Docker Swarm");
-        try {
-            hostURL = new URI(getProperty(PROPERTY_URL, DEFAULT_TARGET_URL));
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
         serviceWaitTime = environment.getProperty("proxy.docker.service-wait-time", Integer.class, 60000);
     }
 
@@ -252,20 +244,24 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
 
     @Override
     protected URI calculateTarget(Container container, PortMappings.PortMappingEntry portMapping, Integer servicePort) throws Exception {
+        String targetProtocol;
         String targetHostName;
         int targetPort;
 
         if (isUseInternalNetwork()) {
+            targetProtocol = getDefaultTargetProtocol();
+
             // Access on containerShortId:containerPort
             targetHostName = container.getId().substring(0, 12);
             targetPort = portMapping.getPort();
         } else {
             // Access on dockerHostName:servicePort
-            targetHostName = hostURL.getHost();
+            targetProtocol = nonInternalNetworkTargetProtocol;
+            targetHostName = nonInternalNetworkTargetURL.getHost();
             targetPort = servicePort;
         }
 
-        return new URI(String.format("%s://%s:%s%s", getDefaultTargetProtocol(), targetHostName, targetPort, portMapping.getTargetPath()));
+        return new URI(String.format("%s://%s:%s%s", targetProtocol, targetHostName, targetPort, portMapping.getTargetPath()));
     }
 
     private SecretBind convertSecret(DockerSwarmSecret secret) throws DockerException, InterruptedException {