opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-06-13 08:15:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from Lafriks/dev

Browse Source 
Get username, name, surname and e-mail from LDAP server
This commit is contained in:
无闻
2015-02-23 13:41:29 -05:00
parent 2369881808 00653e52ee
commit cd8b43d984
6 changed files with 75 additions and 44 deletions
conf/locale
locale_en-US.ini
models
login.go
modules/auth
auth_form.go
ldap
ldap.go
routers/admin
auths.go
templates/admin/auth
edit.tmpl

3
models/login.go

@ -231,7 +231,7 @@ func UserSignIn(uname, passwd string) (*User, error) {
// Return the same LoginUserPlain semantic
// FIXME: https://github.com/gogits/gogs/issues/672
func LoginUserLdapSource(u *User, name, passwd string, sourceId int64, cfg *LDAPConfig, autoRegister bool) (*User, error) {
mail, logged := cfg.Ldapsource.SearchEntry(name, passwd)
name, fn, sn, mail, logged := cfg.Ldapsource.SearchEntry(name, passwd)
if !logged {
// User not in LDAP, do nothing
return nil, ErrUserNotExist
@ -247,6 +247,7 @@ func LoginUserLdapSource(u *User, name, passwd string, sourceId int64, cfg *LDAP
u = &User{
Name: name,
FullName: fn + " " + sn,
LoginType: LDAP,
LoginSource: sourceId,
LoginName: name,