Fix setting ServerAddress property in NativeStore

StealthyCoder · StealthyCoder · commit b24e7f85a488 · 2023-11-11T14:22:23.000+01:00
This will return the ServerAddress property when using the NativeStore.
This happens when you use docker credential helpers, not the credential
store.

The reason this fix is needed is because it needs to be propagated
properly down towards `moby/moby` project in the following logic:

```golang
func authorizationCredsFromAuthConfig(authConfig registrytypes.AuthConfig) docker.AuthorizerOpt {
	cfgHost := registry.ConvertToHostname(authConfig.ServerAddress)
	if cfgHost == "" || cfgHost == registry.IndexHostname {
		cfgHost = registry.DefaultRegistryHost
	}

	return docker.WithAuthCreds(func(host string) (string, string, error) {
		if cfgHost != host {
			logrus.WithFields(logrus.Fields{
				"host":    host,
				"cfgHost": cfgHost,
			}).Warn("Host doesn't match")
			return "", "", nil
		}
		if authConfig.IdentityToken != "" {
			return "", authConfig.IdentityToken, nil
		}
		return authConfig.Username, authConfig.Password, nil
	})
}
```
This logic resides in the following file :
`daemon/containerd/resolver.go` .

In the case when using the containerd storage feature when setting the
`cfgHost` variable from the `authConfig.ServerAddress` it will always be
empty. Since it will never be returned from the NativeStore currently.
Therefore Docker Hub images will work fine, but anything else will fail
since the `cfgHost` will always be the `registry.DefaultRegistryHost`.

Signed-off-by: Eric Bode &lt;eric.bode@foundries.io&gt;
diff --git a/cli/config/credentials/native_store.go b/cli/config/credentials/native_store.go
@@ -51,6 +51,7 @@ func (c *nativeStore) Get(serverAddress string) (types.AuthConfig, error) {
 	auth.Username = creds.Username
 	auth.IdentityToken = creds.IdentityToken
 	auth.Password = creds.Password
+	auth.ServerAddress = creds.ServerAddress
 
 	return auth, nil
 }
@@ -76,6 +77,9 @@ func (c *nativeStore) GetAll() (map[string]types.AuthConfig, error) {
 		ac.Username = creds.Username
 		ac.Password = creds.Password
 		ac.IdentityToken = creds.IdentityToken
+		if ac.ServerAddress == "" {
+			ac.ServerAddress = creds.ServerAddress
+		}
 		authConfigs[registry] = ac
 	}
 
diff --git a/cli/config/credentials/native_store_test.go b/cli/config/credentials/native_store_test.go
@@ -145,9 +145,10 @@ func TestNativeStoreGet(t *testing.T) {
 	assert.NilError(t, err)
 
 	expected := types.AuthConfig{
-		Username: "foo",
-		Password: "bar",
-		Email:    "foo@example.com",
+		Username:      "foo",
+		Password:      "bar",
+		Email:         "foo@example.com",
+		ServerAddress: validServerAddress,
 	}
 	assert.Check(t, is.DeepEqual(expected, actual))
 }
@@ -169,6 +170,7 @@ func TestNativeStoreGetIdentityToken(t *testing.T) {
 	expected := types.AuthConfig{
 		IdentityToken: "abcd1234",
 		Email:         "foo@example2.com",
+		ServerAddress: validServerAddress2,
 	}
 	assert.Check(t, is.DeepEqual(expected, actual))
 }

Original file line number	Diff line number	Diff line change
`@@ -145,9 +145,10 @@ func TestNativeStoreGet(t *testing.T) {`
`145`	`145`	`assert.NilError(t, err)`
`146`	`146`
`147`	`147`	`expected := types.AuthConfig{`
`148`		`- Username: "foo",`
`149`		`- Password: "bar",`
`150`		`- Email: "[email protected]",`
	`148`	`+ Username: "foo",`
	`149`	`+ Password: "bar",`
	`150`	`+ Email: "[email protected]",`
	`151`	`+ ServerAddress: validServerAddress,`
`151`	`152`	`}`
`152`	`153`	`assert.Check(t, is.DeepEqual(expected, actual))`
`153`	`154`	`}`
`@@ -169,6 +170,7 @@ func TestNativeStoreGetIdentityToken(t *testing.T) {`
`169`	`170`	`expected := types.AuthConfig{`
`170`	`171`	`IdentityToken: "abcd1234",`
`171`	`172`	`Email: "[email protected]",`
	`173`	`+ ServerAddress: validServerAddress2,`
`172`	`174`	`}`
`173`	`175`	`assert.Check(t, is.DeepEqual(expected, actual))`
`174`	`176`	`}`