From a9c003ae4ed71a0b9d4ac9b30c3d2735b5c6c3ed Mon Sep 17 00:00:00 2001 From: pawel Date: Fri, 4 Jan 2019 22:00:08 +0100 Subject: [PATCH 1/2] Use Base64Url instead of Base64 --- .../com/github/dockerjava/core/exec/AbstrDockerCmdExec.java | 4 ++-- .../java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java index 25f6c1f5d..61180ebc1 100644 --- a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java +++ b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java @@ -42,7 +42,7 @@ protected AuthConfigurations getBuildAuthConfigs() { protected String registryAuth(@Nonnull AuthConfig authConfig) { try { - return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes()); + return Base64.encodeBase64URLSafeString(new ObjectMapper().writeValueAsString(authConfig).getBytes()); } catch (IOException e) { throw new RuntimeException(e); } @@ -66,7 +66,7 @@ protected String registryConfigs(@Nonnull AuthConfigurations authConfigs) { json = objectMapper.writeValueAsString(authConfigs); } - return Base64.encodeBase64String(json.getBytes()); + return Base64.encodeBase64URLSafeString(json.getBytes()); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java index e5852f5ea..02bc61130 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java @@ -39,7 +39,7 @@ protected AuthConfigurations getBuildAuthConfigs() { protected String registryAuth(AuthConfig authConfig) { try { - return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes()); + return Base64.encodeBase64URLSafeString(new ObjectMapper().writeValueAsString(authConfig).getBytes()); } catch (IOException e) { throw new RuntimeException(e); } @@ -74,7 +74,7 @@ protected String registryConfigs(AuthConfigurations authConfigs) { json = objectMapper.writeValueAsString(authConfigs); } - return Base64.encodeBase64String(json.getBytes()); + return Base64.encodeBase64URLSafeString(json.getBytes()); } catch (IOException e) { throw new RuntimeException(e); } From d0f97b64d58146553f07897592153100b4995660 Mon Sep 17 00:00:00 2001 From: pawel Date: Sat, 5 Jan 2019 00:20:32 +0100 Subject: [PATCH 2/2] Replaced Base64 from Apache Commons with Guava --- .../github/dockerjava/core/exec/AbstrDockerCmdExec.java | 7 +++---- .../com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java index 61180ebc1..1ec333416 100644 --- a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java +++ b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java @@ -8,7 +8,7 @@ import com.github.dockerjava.core.InvocationBuilder; import com.github.dockerjava.core.RemoteApiVersion; import com.github.dockerjava.core.WebTarget; -import org.apache.commons.codec.binary.Base64; +import com.google.common.io.BaseEncoding; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; @@ -42,7 +42,7 @@ protected AuthConfigurations getBuildAuthConfigs() { protected String registryAuth(@Nonnull AuthConfig authConfig) { try { - return Base64.encodeBase64URLSafeString(new ObjectMapper().writeValueAsString(authConfig).getBytes()); + return BaseEncoding.base64Url().encode(new ObjectMapper().writeValueAsString(authConfig).getBytes()); } catch (IOException e) { throw new RuntimeException(e); } @@ -65,8 +65,7 @@ protected String registryConfigs(@Nonnull AuthConfigurations authConfigs) { } else { json = objectMapper.writeValueAsString(authConfigs); } - - return Base64.encodeBase64URLSafeString(json.getBytes()); + return BaseEncoding.base64Url().encode(json.getBytes()); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java index 02bc61130..47681e20c 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java @@ -6,7 +6,7 @@ import com.github.dockerjava.api.model.AuthConfigurations; import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.RemoteApiVersion; -import org.apache.commons.codec.binary.Base64; +import com.google.common.io.BaseEncoding; import javax.ws.rs.client.Invocation; import javax.ws.rs.client.WebTarget; @@ -39,7 +39,7 @@ protected AuthConfigurations getBuildAuthConfigs() { protected String registryAuth(AuthConfig authConfig) { try { - return Base64.encodeBase64URLSafeString(new ObjectMapper().writeValueAsString(authConfig).getBytes()); + return BaseEncoding.base64Url().encode(new ObjectMapper().writeValueAsString(authConfig).getBytes()); } catch (IOException e) { throw new RuntimeException(e); } @@ -74,7 +74,7 @@ protected String registryConfigs(AuthConfigurations authConfigs) { json = objectMapper.writeValueAsString(authConfigs); } - return Base64.encodeBase64URLSafeString(json.getBytes()); + return BaseEncoding.base64Url().encode(json.getBytes()); } catch (IOException e) { throw new RuntimeException(e); }