domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Attempt #3 of ldap fixes

Browse source
This commit is contained in:
Gogs 2015-02-27 12:42:03 +00:00
parent d85366930c
commit fab038b175
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/auth/auth.go
View file

@ -108,17 +108,16 @@ func SignedInUser(req *http.Request, sess session.Store) (*models.User, bool) {
auths := strings.Fields(baHead)
if len(auths) == 2 && auths[0] == "Basic" {
uname, passwd, _ := base.BasicAuthDecode(auths[1])
u, err := models.GetUserByName(uname)
u, err := models.UserSignIn(uname, passwd)
if err != nil {
if err != models.ErrUserNotExist {
log.Error(4, "GetUserByName: %v", err)
log.Error(4, "UserSignIn: %v", err)
}
return nil, false
}
if u.ValidtePassword(passwd) {
return u, true
}
return u, true
}
}
return nil, false