Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdctl: remove GetUser check before mutable commands

Browse Source 
etcdctl was checking if the user exists before applying mutable calls;
if etcdctl contacts a minority member, the member may not know the user
exists on the cluster yet, causing command failure when it should succeed.

If the user does not exist, it will be picked up once the command goes
through raft.

Fixes #6932
This commit is contained in:
Anthony Romano 2016-12-05 11:59:30 -08:00
parent 40f0193c4c
commit 5559a026d7
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etcdctl/ctlv2/command/user_commands.go
View File

@ -112,11 +112,6 @@ func actionUserAdd(c *cli.Context) error {
ctx, cancel := contextWithTotalTimeout(c)
defer cancel()
user, _, _ := getUsernamePassword("", userarg+":")
currentUser, err := api.GetUser(ctx, user)
if currentUser != nil {
fmt.Fprintf(os.Stderr, "User %s already exists\n", user)
os.Exit(1)
}
_, pass, err := getUsernamePassword("New password: ", userarg)
if err != nil {
@ -151,11 +146,6 @@ func actionUserPasswd(c *cli.Context) error {
api, user := mustUserAPIAndName(c)
ctx, cancel := contextWithTotalTimeout(c)
defer cancel()
currentUser, err := api.GetUser(ctx, user)
if currentUser == nil {
fmt.Fprintln(os.Stderr, err.Error())
os.Exit(1)
}
pass, err := speakeasy.Ask("New password: ")
if err != nil {
fmt.Fprintln(os.Stderr, "Error reading password:", err)
@ -193,12 +183,7 @@ func userGrantRevoke(c *cli.Context, grant bool) {
defer cancel()
api, user := mustUserAPIAndName(c)
currentUser, err := api.GetUser(ctx, user)
if currentUser == nil {
fmt.Fprintln(os.Stderr, err.Error())
os.Exit(1)
}
var err error
if grant {
_, err = api.GrantUser(ctx, user, roles)
} else {