Browse Source

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

release/v1.8
zeripath 4 years ago
committed by Lauris BH
parent
commit
0f295ababa
  1. 2
      models/login_source.go
  2. 2
      modules/lfs/server.go

2
models/login_source.go

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

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

Loading…
Cancel
Save