diff options
| author | 无闻 <joe2010xtmf@163.com> | 2014-04-24 14:25:56 -0600 |
|---|---|---|
| committer | 无闻 <joe2010xtmf@163.com> | 2014-04-24 14:25:56 -0600 |
| commit | 37cbfc032a6dc92293401622977f3076c710fed9 (patch) | |
| tree | 8a7613699d3ab8eebdedb2945485b2e677ea4a52 /routers | |
| parent | 5898d562055085d62da8129442b01cd71443163a (diff) | |
| parent | efc05ea1dec5a60c95763fc5158d60b45ef46d8f (diff) | |
| download | gitea-37cbfc032a6dc92293401622977f3076c710fed9.tar.gz gitea-37cbfc032a6dc92293401622977f3076c710fed9.zip | |
Merge pull request #112 from juju2013/master
basic support for LDAP/Microsoft Active Directory authentication
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/user/user.go | 11 |
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) |