aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models/login_source.go2
-rw-r--r--modules/lfs/server.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/models/login_source.go b/models/login_source.go
index 25c7aa3120..46bf3a5e3a 100644
--- a/models/login_source.go
+++ b/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
}
diff --git a/modules/lfs/server.go b/modules/lfs/server.go
index f0f2d4bf44..58acbb807e 100644
--- a/modules/lfs/server.go
+++ b/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