diff options
Diffstat (limited to 'modules/auth/ldap/ldap.go')
| -rw-r--r-- | modules/auth/ldap/ldap.go | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index f75d906e..50101349 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -1,8 +1,8 @@ -// Copyright github.com/juju2013. All rights reserved. +// Copyright 2014 The Gogs Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -// package ldap provide functions & structure to query a LDAP ldap directory +// Package ldap provide functions & structure to query a LDAP ldap directory // For now, it's mainly tested again an MS Active Directory service, see README.md for more information package ldap @@ -15,37 +15,35 @@ import ( // Basic LDAP authentication service type Ldapsource struct { - Name string // canonical name (ie. corporate.ad) - Host string // LDAP host - Port int // port number - UseSSL bool // Use SSL - BindDN string // DN to bind with - BindPassword string // Bind DN password - UserBase string // Base search path for users - AttributeName string // First name attribute - AttributeSurname string // Surname attribute - AttributeMail string // E-mail attribute - Filter string // Query filter to validate entry - Enabled bool // if this source is disabled + Name string // canonical name (ie. corporate.ad) + Host string // LDAP host + Port int // port number + UseSSL bool // Use SSL + BindDN string // DN to bind with + BindPassword string // Bind DN password + UserBase string // Base search path for users + AttributeName string // First name attribute + AttributeSurname string // Surname attribute + AttributeMail string // E-mail attribute + Filter string // Query filter to validate entry + Enabled bool // if this source is disabled } -func (ls Ldapsource) FindUserDN(name string) (userDN string, success bool) { - userDN = "" - success = false +func (ls Ldapsource) FindUserDN(name string) (string, bool) { l, err := ldapDial(ls) if err != nil { log.Error(4, "LDAP Connect error, %s:%v", ls.Host, err) ls.Enabled = false - return + return "", false } - defer l.Close() + log.Trace("Search for LDAP user: %s", name) if ls.BindDN != "" && ls.BindPassword != "" { err = l.Bind(ls.BindDN, ls.BindPassword) if err != nil { log.Debug("Failed to bind as BindDN: %s, %s", ls.BindDN, err.Error()) - return + return "", false } log.Trace("Bound as BindDN %s", ls.BindDN) } else { @@ -63,20 +61,19 @@ func (ls Ldapsource) FindUserDN(name string) (userDN string, success bool) { sr, err := l.Search(search) if err != nil || len(sr.Entries) < 1 { log.Debug("Failed search using filter %s: %s", userFilter, err.Error()) - return + return "", false } else if len(sr.Entries) > 1 { log.Debug("Filter '%s' returned more than one user.", userFilter) - return + return "", false } - userDN = sr.Entries[0].DN + userDN := sr.Entries[0].DN if userDN == "" { log.Error(4, "LDAP search was succesful, but found no DN!") - return + return "", false } - success = true - return + return userDN, true } // searchEntry : search an LDAP source if an entry (name, passwd) is valid and in the specific filter |