mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-23 15:53:07 -05:00
Only allow local login if password is non-empty (#5906)
This commit is contained in:
parent
80098bd752
commit
0f295ababa
2 changed files with 2 additions and 2 deletions
|
@ -644,7 +644,7 @@ func UserSignIn(username, password string) (*User, error) {
|
||||||
if hasUser {
|
if hasUser {
|
||||||
switch user.LoginType {
|
switch user.LoginType {
|
||||||
case LoginNoType, LoginPlain, LoginOAuth2:
|
case LoginNoType, LoginPlain, LoginOAuth2:
|
||||||
if user.ValidatePassword(password) {
|
if user.IsPasswordSet() && user.ValidatePassword(password) {
|
||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -582,7 +582,7 @@ func parseToken(authorization string) (*models.User, *models.Repository, string,
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, "basic", err
|
return nil, nil, "basic", err
|
||||||
}
|
}
|
||||||
if !u.ValidatePassword(password) {
|
if !u.IsPasswordSet() || !u.ValidatePassword(password) {
|
||||||
return nil, nil, "basic", fmt.Errorf("Basic auth failed")
|
return nil, nil, "basic", fmt.Errorf("Basic auth failed")
|
||||||
}
|
}
|
||||||
return u, nil, "basic", nil
|
return u, nil, "basic", nil
|
||||||
|
|
Loading…
Reference in a new issue