Browse Source

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

tags/v1.21.12.1
zeripath Lauris BH 6 years ago
parent
commit
0f295ababa
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      models/login_source.go
  2. +1
    -1
      modules/lfs/server.go

+ 1
- 1
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
}



+ 1
- 1
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


Loading…
Cancel
Save