poanetwork
/
gecko
mirror of https://github.com/poanetwork/gecko.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ks importuser fix

This commit is contained in:
Collin Montag 2020-05-18 14:19:15 -04:00
parent a6c8a224e4
commit b2a85ccecd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/keystore/service.go
View File

@ -266,18 +266,17 @@ func (ks *Keystore) ImportUser(r *http.Request, args *ImportUserArgs, reply *Imp
ks.log.Verbo("ImportUser called for %s", args.Username)
usr, err := ks.getUser(args.Username)
switch {
case err == nil || usr != nil:
if usr, err := ks.getUser(args.Username); err == nil || usr != nil {
return fmt.Errorf("user already exists: %s", args.Username)
case !usr.CheckPassword(args.Password):
return fmt.Errorf("incorrect password for user %q", args.Username)
}
userData := UserDB{}
if err := ks.codec.Unmarshal(args.User.Bytes, &userData); err != nil {
return err
}
if !userData.User.CheckPassword(args.Password) {
return fmt.Errorf("incorrect password for %s", args.Username)
}
usrBytes, err := ks.codec.Marshal(&userData.User)
if err != nil {