Prevent auths field in config.json to be null (#2142)

chunweilim · web-flow · commit e92c30e403da · 2023-07-30T17:26:49.000-06:00
Fixes #2138
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -28,7 +29,7 @@ public class DockerConfigFile {
     };
 
     @JsonProperty
-    private final Map<String, AuthConfig> auths;
+    private Map<String, AuthConfig> auths;
 
     @JsonProperty
     private String currentContext;
@@ -46,6 +47,11 @@ public Map<String, AuthConfig> getAuths() {
         return auths;
     }
 
+    @JsonSetter
+    public void setAuths(Map<String, AuthConfig> authConfigMap) {
+        auths = (authConfigMap == null || authConfigMap.size() == 0) ? new HashMap<>() : authConfigMap;
+    }
+
     void addAuthConfig(AuthConfig config) {
         auths.put(config.getRegistryAddress(), config);
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -164,6 +164,12 @@ public void nonExistent() throws IOException {
         assertThat(runTest("idontexist"), is(expected));
     }
 
+    @Test
+    public void validJsonAuthsNull() throws IOException {
+        DockerConfigFile expected = new DockerConfigFile();
+        assertThat(runTest("validJsonAuthsNull"), is(expected));
+    }
+
     private DockerConfigFile runTest(String testFileName) throws IOException {
         return DockerConfigFile.loadConfig(JSONTestHelper.getMapper(), new File(FILESROOT, testFileName).getAbsolutePath());
     }
diff --git a/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json b/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json
@@ -0,0 +1,9 @@
+{
+    "auths": null,
+    "credsStore": "desktop",
+    "plugins": {
+        "-x-cli-hints": {
+            "enabled": "true"
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,12 @@ public void nonExistent() throws IOException {`
`164`	`164`	`assertThat(runTest("idontexist"), is(expected));`
`165`	`165`	`}`
`166`	`166`
	`167`	`+ @Test`
	`168`	`+ public void validJsonAuthsNull() throws IOException {`
	`169`	`+ DockerConfigFile expected = new DockerConfigFile();`
	`170`	`+ assertThat(runTest("validJsonAuthsNull"), is(expected));`
	`171`	`+ }`
	`172`	`+`
`167`	`173`	`private DockerConfigFile runTest(String testFileName) throws IOException {`
`168`	`174`	`return DockerConfigFile.loadConfig(JSONTestHelper.getMapper(), new File(FILESROOT, testFileName).getAbsolutePath());`
`169`	`175`	`}`