Merge branch 'master' into continueShutdown

fabric8io · Aug 8, 2019 · 4399681 · 4399681
2 parents be67b8d + 8253885
commit 4399681
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -5,6 +5,7 @@
   - ECR credentials from IAM Task role for ECS Fargate deployment ([#1233](https://github.com/fabric8io/docker-maven-plugin/issues/1233))
   - Fix bug in properties names extracted from docker config json file ([#1237](https://github.com/fabric8io/docker-maven-plugin/issues/1237))
   - Fix that portPropertyFile is not written anymore [F#1112]
+  - Use identity token if found in Docker config.json ([#1249](https://github.com/fabric8io/docker-maven-plugin/issues/1249))
 
 * **0.30.0** (2019-04-21)
   - Restore ANSI color to Maven logging if disabled during plugin execution and enable color for Windows with Maven 3.5.0 or later. Color logging is enabled by default, but disabled if the Maven CLI disables color (e.g. in batch mode) ([#1108](https://github.com/fabric8io/docker-maven-plugin/issues/1108))

diff --git a/src/main/java/io/fabric8/maven/docker/access/AuthConfig.java b/src/main/java/io/fabric8/maven/docker/access/AuthConfig.java
@@ -22,21 +22,28 @@ public class AuthConfig {
     private final String password;
     private final String email;
     private final String auth;
+    private final String identityToken;
 
     private final String authEncoded;
 
     public AuthConfig(Map<String,String> params) {
         this(params.get("username"),
                 params.get("password"),
                 params.get("email"),
-                params.get("auth"));
+                params.get("auth"),
+                params.get("identityToken"));
     }
 
     public AuthConfig(String username, String password, String email, String auth) {
+        this(username, password, email, auth, null);
+    }
+
+    public AuthConfig(String username, String password, String email, String auth, String identityToken) {
         this.username = username;
         this.password = password;
         this.email = email;
         this.auth = auth;
+        this.identityToken = identityToken;
         authEncoded = createAuthEncoded();
     }
 
@@ -47,11 +54,22 @@ public AuthConfig(String username, String password, String email, String auth) {
      * @param email the email to use for authentication
      */
     public AuthConfig(String credentialsEncoded, String email) {
+        this(credentialsEncoded, email, null);
+    }
+
+    /**
+     * Constructor which takes an base64 encoded credentials in the form 'user:password'
+     *
+     * @param credentialsEncoded the docker encoded user and password
+     * @param email the email to use for authentication
+     */
+    public AuthConfig(String credentialsEncoded, String email, String identityToken) {
         String credentials = new String(Base64.decodeBase64(credentialsEncoded));
         String[] parsedCreds = credentials.split(":",2);
         username = parsedCreds[0];
         password = parsedCreds[1];
         this.email = email;
+        this.identityToken = identityToken;
         auth = null;
         authEncoded = createAuthEncoded();
     }
@@ -68,6 +86,10 @@ public String getAuth() {
         return auth;
     }
 
+    public String getIdentityToken() {
+        return identityToken;
+    }
+
     public String toHeaderValue() {
         return authEncoded;
     }
@@ -76,10 +98,15 @@ public String toHeaderValue() {
 
     private String createAuthEncoded() {
         JsonObject ret = new JsonObject();
-        putNonNull(ret, "username", username);
-        putNonNull(ret, "password", password);
-        putNonNull(ret, "email", email);
-        putNonNull(ret, "auth", auth);
+        if(identityToken != null) {
+            putNonNull(ret, "identitytoken", identityToken);
+        } else {
+            putNonNull(ret, "username", username);
+            putNonNull(ret, "password", password);
+            putNonNull(ret, "email", email);
+            putNonNull(ret, "auth", auth);
+        }
+
         try {
             return encodeBase64ChunkedURLSafeString(ret.toString().getBytes("UTF-8"));
         } catch (UnsupportedEncodingException e) {

diff --git a/src/main/java/io/fabric8/maven/docker/util/AuthConfigFactory.java b/src/main/java/io/fabric8/maven/docker/util/AuthConfigFactory.java
@@ -473,8 +473,9 @@ private AuthConfig extractAuthConfigFromAuths(String registryToLookup, JsonObjec
             return null;
         }
         String auth = credentials.get("auth").getAsString();
+        String identityToken = credentials.has("identitytoken") ? credentials.get("identitytoken").getAsString() : null;
         String email = credentials.has(AUTH_EMAIL) ? credentials.get(AUTH_EMAIL).getAsString() : null;
-        return new AuthConfig(auth,email);
+        return new AuthConfig(auth, email, identityToken);
     }
 
     private AuthConfig extractAuthConfigFromCredentialsHelper(String registryToLookup, String credConfig) throws MojoExecutionException {