cerc-io/gitea
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zeripath 2019-01-30 21:46:19 +00:00 committed by Lauris BH
parent 3f802a2846
commit e5af93af20
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 {
switch user.LoginType {
case LoginNoType, LoginPlain, LoginOAuth2:
if user.ValidatePassword(password) {
if user.IsPasswordSet() && user.ValidatePassword(password) {
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 {
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 u, nil, "basic", nil