Fix NPE when reading "auths" section in ~/.docker/config.json (#2536)

GoogleContainerTools · Jun 22, 2020 · 38ea51b · 38ea51b
1 parent cb78087
commit 38ea51b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/jib-core/CHANGELOG.md b/jib-core/CHANGELOG.md
@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fixed `NullPointerException` when the `"auths":` section in `~/.docker/config.json` has an entry with no `"auth":` field. ([#2535](https://github.com/GoogleContainerTools/jib/issues/2535))
+
 ## 0.15.0
 
 ### Added

diff --git a/...java/com/google/cloud/tools/jib/registry/credentials/DockerConfigCredentialRetriever.java b/...java/com/google/cloud/tools/jib/registry/credentials/DockerConfigCredentialRetriever.java
@@ -140,7 +140,7 @@ Optional<Credential> retrieve(DockerConfig dockerConfig, Consumer<LogEvent> logg
 
       // Lastly, find defined auth.
       AuthTemplate auth = dockerConfig.getAuthFor(registryAlias);
-      if (auth != null) {
+      if (auth != null && auth.getAuth() != null) {
         // 'auth' is a basic authentication token that should be parsed back into credentials
         String usernameColonPassword =
             new String(Base64.decodeBase64(auth.getAuth()), StandardCharsets.UTF_8);

diff --git a/.../com/google/cloud/tools/jib/registry/credentials/DockerConfigCredentialRetrieverTest.java b/.../com/google/cloud/tools/jib/registry/credentials/DockerConfigCredentialRetrieverTest.java
@@ -194,4 +194,15 @@ public void testRetrieve_azureIdentityToken() throws IOException, URISyntaxExcep
     Assert.assertEquals("<token>", credentials.get().getUsername());
     Assert.assertEquals("cool identity token", credentials.get().getPassword());
   }
+
+  @Test
+  public void testRetrieve_noErrorWhenMissingAuthField() throws IOException, URISyntaxException {
+    Path dockerConfigFile = Paths.get(Resources.getResource("core/json/dockerconfig.json").toURI());
+
+    DockerConfigCredentialRetriever dockerConfigCredentialRetriever =
+        DockerConfigCredentialRetriever.create("no auth field", dockerConfigFile);
+
+    Optional<Credential> credentials = dockerConfigCredentialRetriever.retrieve(mockLogger);
+    Assert.assertFalse(credentials.isPresent());
+  }
 }
diff --git a/jib-core/src/test/resources/core/json/dockerconfig.json b/jib-core/src/test/resources/core/json/dockerconfig.json
@@ -4,7 +4,8 @@
     "some registry":{"auth":"c29tZTphdXRo","password":"ignored"},
     "https://registry":{"auth":"dG9rZW4="},
 
-    "example.com":{"auth":"should not match example"}
+    "example.com":{"auth":"should not match example"},
+    "no auth field":{}
   },
   "credsStore":"some credential store",
   "credHelpers":{

diff --git a/jib-gradle-plugin/CHANGELOG.md b/jib-gradle-plugin/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 
 - Fixed reporting a wrong credential helper name when the helper does not exist on Windows. ([#2527](https://github.com/GoogleContainerTools/jib/issues/2527))
+- Fixed `NullPointerException` when the `"auths":` section in `~/.docker/config.json` has an entry with no `"auth":` field. ([#2535](https://github.com/GoogleContainerTools/jib/issues/2535))
 
 ## 2.4.0
 

diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 
 - Fixed reporting a wrong credential helper name when the helper does not exist on Windows. ([#2527](https://github.com/GoogleContainerTools/jib/issues/2527))
+- Fixed `NullPointerException` when the `"auths":` section in `~/.docker/config.json` has an entry with no `"auth":` field. ([#2535](https://github.com/GoogleContainerTools/jib/issues/2535))
 
 ## 2.4.0