docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity

Merge pull request #19806 from liusdu/forbid-null-login

Browse Source 
forbid login of a null-string username
Upstream-commit: ca48f7350c82f48edf1150d735543a1ea6d4eabe
Component: engine
This commit is contained in:
David Calavera
2016-01-29 10:34:16 -08:00
parent cce6e581aa a9daf50532
commit ddec0cfa16
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/api/client/login.go
View File

@@ -81,8 +81,9 @@ func (cli *DockerCli) configureAuth(flUser, flPassword, flEmail, serverAddress s
if !ok {
authconfig = types.AuthConfig{}
}
authconfig.Username = strings.TrimSpace(authconfig.Username)
if flUser == "" {
if flUser = strings.TrimSpace(flUser); flUser == "" {
cli.promptWithDefault("Username", authconfig.Username)
flUser = readInput(cli.in, cli.out)
flUser = strings.TrimSpace(flUser)
@@ -91,6 +92,10 @@ func (cli *DockerCli) configureAuth(flUser, flPassword, flEmail, serverAddress s
}
}
if flUser == "" {
return authconfig, fmt.Errorf("Error: Non-null Username Required")
}
if flPassword == "" {
oldState, err := term.SaveState(cli.inFd)
if err != nil {
@@ -104,7 +109,7 @@ func (cli *DockerCli) configureAuth(flUser, flPassword, flEmail, serverAddress s
term.RestoreTerminal(cli.inFd, oldState)
if flPassword == "" {
return authconfig, fmt.Errorf("Error : Password Required")
return authconfig, fmt.Errorf("Error: Password Required")
}
}