Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-06 22:30:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix misspells and ineffectual assignments

Browse Source
This commit is contained in:
Nicola Murino
2019-07-20 21:17:53 +02:00
parent 1019d74243
commit 22b8dc7f1d
7 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dataprovider/sqlcommon.go
View File

@@ -37,7 +37,7 @@ func sqlCommonValidateUserAndPass(username string, password string) (User, error
if err != nil {
logger.Warn(logSender, "error authenticating user: %v, error: %v", username, err)
} else {
match := false
var match bool
if strings.HasPrefix(user.Password, argonPwdPrefix) {
match, err = argon2id.ComparePasswordAndHash(password, user.Password)
if err != nil {
@@ -63,19 +63,20 @@ func sqlCommonValidateUserAndPubKey(username string, pubKey string) (User, error
user, err := getUserByUsername(username)
if err != nil {
logger.Warn(logSender, "error authenticating user: %v, error: %v", username, err)
} else {
if len(user.PublicKey) > 0 {
storedPubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(user.PublicKey))
if err != nil {
logger.Warn(logSender, "error parsing stored public key for user %v: %v", username, err)
return user, err
}
if string(storedPubKey.Marshal()) != pubKey {
err = errors.New("Invalid credentials")
}
} else {
err = errors.New("Invalid credentials")
return user, err
}
if len(user.PublicKey) > 0 {
storedPubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(user.PublicKey))
if err != nil {
logger.Warn(logSender, "error parsing stored public key for user %v: %v", username, err)
return user, err
}
if string(storedPubKey.Marshal()) != pubKey {
err = errors.New("Invalid credentials")
return user, err
}
} else {
err = errors.New("Invalid credentials")
}
return user, err
}