Browse Source

Change basic authentication to use the models/login.go UserSignIn, to permit checkout using non-local users

pull/909/head
Karl Southern 10 years ago
parent
commit
b6cb5f0283
  1. 11
      modules/auth/auth.go

11
modules/auth/auth.go

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

Loading…
Cancel
Save