Fix versioning Auth issues for unknown API connections.

KostyaSha · KostyaSha · commit a0ec66f12c39 · 2016-03-04T19:21:57.000+03:00
Signed-off-by: Kanstantsin Shautsou &lt;kanstantsin.sha@gmail.com&gt;
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -60,7 +60,7 @@ public class RemoteApiVersion implements Serializable {
     /**
      * Unknown, docker doesn't reflect reality. I.e. we implemented method, but for javadoc it not clear when it was added.
      */
-    private static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
+    public static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
 
         @Override
         public boolean isGreaterOrEqual(final RemoteApiVersion other) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -1,11 +1,14 @@
 package com.github.dockerjava.jaxrs;
 
+import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
 import javax.ws.rs.client.WebTarget;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.codec.binary.Base64;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -46,10 +49,18 @@ protected String registryAuth(AuthConfig authConfig) {
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
             final String json;
-            if (dockerClientConfig.getApiVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
-                json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
+            final ObjectMapper objectMapper = new ObjectMapper();
+            final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion();
+
+            if (apiVersion.equals(UNKNOWN_VERSION)) {
+                ObjectNode rootNode = objectMapper.valueToTree(authConfigs.getConfigs()); // all registries
+                final ObjectNode authNodes = objectMapper.valueToTree(authConfigs); // wrapped in "configs":{}
+                rootNode.setAll(authNodes); // merge 2 variants
+                json = rootNode.toString();
+            } else if (apiVersion.isGreaterOrEqual(VERSION_1_19)) {
+                json = objectMapper.writeValueAsString(authConfigs.getConfigs());
             } else {
-                json = new ObjectMapper().writeValueAsString(authConfigs);
+                json = objectMapper.writeValueAsString(authConfigs);
             }
 
             return Base64.encodeBase64String(json.getBytes());
