Fix login persistence regression against Hub

Login no longer persists for Docker Hub, as a mistake in the code was not using the special case Docker Hub key to save in the store. Signed-off-by: apostasie <spam_blackhole@farcloser.world>
containerd · Oct 2, 2024 · 5cdb3e0 · 5cdb3e0
1 parent c156ee6
commit 5cdb3e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/pkg/imgutil/dockerconfigresolver/credentialsstore.go b/pkg/imgutil/dockerconfigresolver/credentialsstore.go
@@ -83,7 +83,7 @@ func (cs *CredentialsStore) Store(registryURL *RegistryURL, credentials *Credent
 	if registryURL.Namespace != nil {
 		credentials.ServerAddress = fmt.Sprintf("%s%s?%s", registryURL.Host, registryURL.Path, registryURL.RawQuery)
 	} else {
-		credentials.ServerAddress = registryURL.Host
+		credentials.ServerAddress = registryURL.CanonicalIdentifier()
 	}
 
 	// XXX future namespaced url likely require special handling here

diff --git a/pkg/imgutil/dockerconfigresolver/credentialsstore_test.go b/pkg/imgutil/dockerconfigresolver/credentialsstore_test.go
@@ -393,3 +393,5 @@ func TestWorkingCredentialsStore(t *testing.T) {
 
 	})
 }
+
+// TODO: add more tests that write credentials (specifically to hub locations) to verify they use the canonical id properly
diff --git a/pkg/imgutil/dockerconfigresolver/registryurl_test.go b/pkg/imgutil/dockerconfigresolver/registryurl_test.go
@@ -38,6 +38,11 @@ func TestURLParsingAndID(t *testing.T) {
 			address: "whatever://",
 			error:   ErrUnsupportedScheme,
 		},
+		{
+			address:    "",
+			identifier: "https://index.docker.io/v1/",
+			allIDs:     []string{"https://index.docker.io/v1/"},
+		},
 		{
 			address:    "https://index.docker.io/v1/",
 			identifier: "https://index.docker.io/v1/",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -393,3 +393,5 @@ func TestWorkingCredentialsStore(t *testing.T) {

		})
		}

		// TODO: add more tests that write credentials (specifically to hub locations) to verify they use the canonical id properly