mirror of https://github.com/docker/cli.git
Fix panic when failing to get DefaultAuthConfig
Commit f32731f902
fixed a potential panic
when an error was returned while trying to get existing credentials.
However, other code paths currently use the result of `GetDefaultAuthConfig()`
even in an error condition; this resulted in a panic, because a `nil` was
returned.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
2291f610ae
commit
c2820a7e3b
|
@ -63,6 +63,9 @@ func RegistryAuthenticationPrivilegedFunc(cli Cli, index *registrytypes.IndexInf
|
||||||
indexServer := registry.GetAuthConfigKey(index)
|
indexServer := registry.GetAuthConfigKey(index)
|
||||||
isDefaultRegistry := indexServer == ElectAuthServer(context.Background(), cli)
|
isDefaultRegistry := indexServer == ElectAuthServer(context.Background(), cli)
|
||||||
authConfig, err := GetDefaultAuthConfig(cli, true, indexServer, isDefaultRegistry)
|
authConfig, err := GetDefaultAuthConfig(cli, true, indexServer, isDefaultRegistry)
|
||||||
|
if authConfig == nil {
|
||||||
|
authConfig = &types.AuthConfig{}
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(cli.Err(), "Unable to retrieve stored credentials for %s, error: %s.\n", indexServer, err)
|
fmt.Fprintf(cli.Err(), "Unable to retrieve stored credentials for %s, error: %s.\n", indexServer, err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -111,11 +111,12 @@ func runLogin(dockerCli command.Cli, opts loginOptions) error { //nolint: gocycl
|
||||||
serverAddress = authServer
|
serverAddress = authServer
|
||||||
}
|
}
|
||||||
|
|
||||||
var err error
|
|
||||||
var authConfig *types.AuthConfig
|
|
||||||
var response registrytypes.AuthenticateOKBody
|
var response registrytypes.AuthenticateOKBody
|
||||||
isDefaultRegistry := serverAddress == authServer
|
isDefaultRegistry := serverAddress == authServer
|
||||||
authConfig, err = command.GetDefaultAuthConfig(dockerCli, opts.user == "" && opts.password == "", serverAddress, isDefaultRegistry)
|
authConfig, err := command.GetDefaultAuthConfig(dockerCli, opts.user == "" && opts.password == "", serverAddress, isDefaultRegistry)
|
||||||
|
if authConfig == nil {
|
||||||
|
authConfig = &types.AuthConfig{}
|
||||||
|
}
|
||||||
if err == nil && authConfig.Username != "" && authConfig.Password != "" {
|
if err == nil && authConfig.Username != "" && authConfig.Password != "" {
|
||||||
response, err = loginWithCredStoreCreds(ctx, dockerCli, authConfig)
|
response, err = loginWithCredStoreCreds(ctx, dockerCli, authConfig)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue