Skip to content

Commit

Permalink
configfile: Initialize nil AuthConfigs
Browse files Browse the repository at this point in the history
Initialize AuthConfigs map if it's nil before returning it.
This fixes fileStore.Store nil dereference panic when adding a new key
to the map.

Signed-off-by: Danial Gharib <danial.mail.gh@gmail.com>
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
  • Loading branch information
Danial-Gharib authored and vvoland committed Jul 19, 2023
1 parent 803d4a9 commit ad43df5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions cli/config/configfile/file.go
Expand Up @@ -94,6 +94,9 @@ func (configFile *ConfigFile) ContainsAuth() bool {

// GetAuthConfigs returns the mapping of repo to auth configuration
func (configFile *ConfigFile) GetAuthConfigs() map[string]types.AuthConfig {
if configFile.AuthConfigs == nil {
configFile.AuthConfigs = make(map[string]types.AuthConfig)
}
return configFile.AuthConfigs
}

Expand Down
3 changes: 2 additions & 1 deletion cli/config/credentials/file_store.go
Expand Up @@ -52,7 +52,8 @@ func (c *fileStore) GetAll() (map[string]types.AuthConfig, error) {

// Store saves the given credentials in the file store.
func (c *fileStore) Store(authConfig types.AuthConfig) error {
c.file.GetAuthConfigs()[authConfig.ServerAddress] = authConfig
authConfigs := c.file.GetAuthConfigs()
authConfigs[authConfig.ServerAddress] = authConfig
return c.file.Save()
}

Expand Down

0 comments on commit ad43df5

Please sign in to comment.