Relax protocol check in DefaultDockerClientConfig (docker-java#1818)

bsideup · web-flow · commit ddfaf5634475 · 2022-02-14T21:33:53.000-05:00
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -22,7 +22,6 @@
 import java.net.URI;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
@@ -106,14 +105,7 @@ private URI checkDockerHostScheme(URI dockerHost) {
         if (dockerHost == null) {
             throw new DockerClientException("'dockerHost' is null");
         }
-        switch (Objects.toString(dockerHost.getScheme())) {
-            case "tcp":
-            case "unix":
-            case "npipe":
-                return dockerHost;
-            default:
-                throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost);
-        }
+        return dockerHost;
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -80,8 +80,7 @@ protected ApacheDockerHttpClientImpl(
                 );
                 break;
             default:
-                pathPrefix = "";
-                host = HttpHost.create(dockerHost);
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);
         }
 
         PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -175,7 +175,7 @@ private OkDockerHttpClient(
                 }
                 break;
             default:
-                baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);
         }
         baseUrl = baseUrlBuilder.build();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.UUID;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -172,28 +173,11 @@ public void testTlsVerifyAndCertPath() throws Exception {
                 new LocalDirectorySSLConfig(dockerCertPath()));
     }
 
-    @Test(expected = DockerClientException.class)
-    public void testWrongHostScheme() throws Exception {
-        new DefaultDockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null);
-    }
-
     @Test()
-    public void testTcpHostScheme() throws Exception {
-        new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null);
-    }
-
-    @Test()
-    public void testUnixHostScheme() throws Exception {
-        new DefaultDockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null);
-    }
-
-    @Test()
-    public void testNpipeHostScheme() throws Exception {
-        new DefaultDockerClientConfig(URI.create("npipe://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null);
+    public void testAnyHostScheme() throws Exception {
+        URI dockerHost = URI.create(UUID.randomUUID().toString().replace("-", "") + "://foo");
+        new DefaultDockerClientConfig(dockerHost, "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+            null);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,7 @@ protected ApacheDockerHttpClientImpl(`
`80`	`80`	`);`
`81`	`81`	`break;`
`82`	`82`	`default:`
`83`		`- pathPrefix = "";`
`84`		`- host = HttpHost.create(dockerHost);`
	`83`	`+ throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ private OkDockerHttpClient(`
`175`	`175`	`}`
`176`	`176`	`break;`
`177`	`177`	`default:`
`178`		`- baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();`
	`178`	`+ throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);`
`179`	`179`	`}`
`180`	`180`	`baseUrl = baseUrlBuilder.build();`
`181`	`181`	`}`