realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Only allow local login if password is non-empty (#5906)

Browse source
This commit is contained in:
zeripath 2019-01-30 21:18:54 +00:00 committed by Lauris BH
parent 80098bd752
commit 0f295ababa
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/login_source.go
View file

@ -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
} }

2
modules/lfs/server.go
View file

@ -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