Merge pull request #1427 from vrothberg/fix-podman-11636

docker/config: handle credentials not found errors
containers · Dec 7, 2021 · 6f3c845 · 6f3c845
2 parents 08ebaed + 08a4c70
commit 6f3c845
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/pkg/docker/config/config.go b/pkg/docker/config/config.go
@@ -620,6 +620,10 @@ func getAuthFromCredHelper(credHelper, registry string) (types.DockerAuthConfig,
 	p := helperclient.NewShellProgramFunc(helperName)
 	creds, err := helperclient.Get(p, registry)
 	if err != nil {
+		if credentials.IsErrCredentialsNotFoundMessage(err.Error()) {
+			logrus.Debugf("Not logged in to %s with credential helper %s", registry, credHelper)
+			err = nil
+		}
 		return types.DockerAuthConfig{}, err
 	}
 

diff --git a/pkg/docker/config/config_test.go b/pkg/docker/config/config_test.go
@@ -547,6 +547,14 @@ func TestGetAllCredentials(t *testing.T) {
 		SystemRegistriesConfDirPath: filepath.Join("testdata", "IdoNotExist"),
 	}
 
+	// Make sure that we can handle no-creds-found errors.
+	os.Setenv("DOCKER_CONFIG", filepath.Join(path, "testdata"))
+	authConfigs, err := GetAllCredentials(nil)
+	require.NoError(t, err)
+	require.Len(t, authConfigs, 1)
+	require.Equal(t, authConfigs["registry-no-creds.com"], types.DockerAuthConfig{})
+	os.Unsetenv("DOCKER_CONFIG")
+
 	for _, data := range [][]struct {
 		writeKey    string
 		expectedKey string

diff --git a/pkg/docker/config/testdata/config.json b/pkg/docker/config/testdata/config.json
@@ -0,0 +1,5 @@
+{
+	"credHelpers" : {
+		"registry-no-creds.com" : "helper-registry"
+	}
+}
diff --git a/pkg/docker/config/testdata/docker-credential-helper-registry b/pkg/docker/config/testdata/docker-credential-helper-registry
@@ -6,6 +6,7 @@ case "${1}" in
         case "${REGISTRY}" in
             ("registry-a.com") echo "{\"ServerURL\":\"${REGISTRY}\",\"Username\":\"foo\",\"Secret\":\"bar\"}" ;;
             ("registry-b.com") echo "{\"ServerURL\":\"${REGISTRY}\",\"Username\":\"<token>\",\"Secret\":\"fizzbuzz\"}" ;;
+            ("registry-no-creds.com") echo "credentials not found in native keychain" && exit 1 ;;
             (*) echo "{}" ;;
         esac
         exit 0