fix registry auth regression (#97)

introduced with commit: c30d664 Signed-off-by: Jonas Galvão Xavier <jonas.agx@gmail.com>
anchore · Feb 1, 2022 · f162f1e · f162f1e
1 parent c30d664
commit f162f1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/pkg/image/oci/registry_provider.go b/pkg/image/oci/registry_provider.go
@@ -78,13 +78,6 @@ func prepareReferenceOptions(registryOptions *image.RegistryOptions) []name.Opti
 }
 
 func prepareRemoteOptions(ref name.Reference, registryOptions *image.RegistryOptions) (opts []remote.Option) {
-	if registryOptions == nil {
-		// use the Keychain specified from a docker config file.
-		log.Debugf("no registry credentials configured, using the default keychain")
-		opts = append(opts, remote.WithAuthFromKeychain(authn.DefaultKeychain))
-		return
-	}
-
 	if registryOptions.InsecureSkipTLSVerify {
 		t := &http.Transport{
 			// nolint: gosec
@@ -98,6 +91,10 @@ func prepareRemoteOptions(ref name.Reference, registryOptions *image.RegistryOpt
 	authenticator := registryOptions.Authenticator(ref.Context().RegistryStr())
 	if authenticator != nil {
 		opts = append(opts, remote.WithAuth(authenticator))
+	} else {
+		// use the Keychain specified from a docker config file.
+		log.Debugf("no registry credentials configured, using the default keychain")
+		opts = append(opts, remote.WithAuthFromKeychain(authn.DefaultKeychain))
 	}
 
 	return

diff --git a/pkg/image/source_test.go b/pkg/image/source_test.go
@@ -21,6 +21,12 @@ func TestDetectSource(t *testing.T) {
 		tarPath          string
 		tarPaths         []string
 	}{
+		{
+			name:             "podman-engine",
+			input:            "podman:something:latest",
+			source:           PodmanDaemonSource,
+			expectedLocation: "something:latest",
+		},
 		{
 			name:             "docker-archive",
 			input:            "docker-archive:a/place.tar",