summaryrefslogtreecommitdiffstats
path: root/routers/user/user.go
diff options
context:
space:
mode:
Diffstat (limited to 'routers/user/user.go')
-rw-r--r--routers/user/user.go11
1 files changed, 10 insertions, 1 deletions
diff --git a/routers/user/user.go b/routers/user/user.go
index 7decd72d4e..75314237dd 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -89,7 +89,16 @@ func SignInPost(ctx *middleware.Context, form auth.LogInForm) {
return
}
- user, err := models.LoginUserPlain(form.UserName, form.Password)
+ var user *models.User
+ var err error
+ // try to login against LDAP if defined
+ if base.LdapAuth {
+ user, err = models.LoginUserLdap(form.UserName, form.Password)
+ }
+ // try local if not LDAP or it's failed
+ if (!base.LdapAuth) || (err != nil) {
+ user, err = models.LoginUserPlain(form.UserName, form.Password)
+ }
if err != nil {
if err == models.ErrUserNotExist {
log.Trace("%s Log in failed: %s/%s", ctx.Req.RequestURI, form.UserName, form.Password)