Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion services/auth/basic.go
Original file line number Diff line number Diff line change
@@ -113,8 +113,9 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
if err != nil {
if !user_model.IsErrUserNotExist(err) {
log.Error("UserSignIn: %v", err)
return nil, err
}
return nil, err
return nil, nil
}

if skipper, ok := source.Cfg.(LocalTwoFASkipper); ok && skipper.IsSkipLocalTwoFA() {
3 changes: 2 additions & 1 deletion services/auth/oauth2.go
Original file line number Diff line number Diff line change
@@ -123,8 +123,9 @@ func (o *OAuth2) Verify(req *http.Request, w http.ResponseWriter, store DataStor
if err != nil {
if !user_model.IsErrUserNotExist(err) {
log.Error("GetUserByName: %v", err)
return nil, err
}
return nil, err
return nil, nil
}

log.Trace("OAuth2 Authorization: Logged in user %-v", user)
5 changes: 4 additions & 1 deletion services/auth/reverseproxy.go
Original file line number Diff line number Diff line change
@@ -60,10 +60,13 @@ func (r *ReverseProxy) getUserFromAuthUser(req *http.Request) (*user_model.User,

user, err := user_model.GetUserByName(req.Context(), username)
if err != nil {
if !user_model.IsErrUserNotExist(err) || !r.isAutoRegisterAllowed() {
if !user_model.IsErrUserNotExist(err) {
log.Error("GetUserByName: %v", err)
return nil, err
}
if !r.isAutoRegisterAllowed() {
return nil, nil
}
user = r.newUser(req)
}
return user, nil