Skip to content

Relax protocol check in DefaultDockerClientConfig #1818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bsideup merged 1 commit into from
Feb 15, 2022
Merged

Relax protocol check in DefaultDockerClientConfig #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions ...tpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ protected ApacheDockerHttpClientImpl(
);
break;
default:
pathPrefix = "";
host = HttpHost.create(dockerHost);
throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);
}

PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(
Expand Down
2 changes: 1 addition & 1 deletion ...-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private OkDockerHttpClient(
}
break;
default:
baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);
}
baseUrl = baseUrlBuilder.build();
}
Expand Down
26 changes: 5 additions & 21 deletions docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down