|
|
|
@ -37,6 +37,12 @@ func (l Ldap) ValidateUser(user string, pass string) (User, error) {
|
|
|
|
|
if err != nil { |
|
|
|
|
return User{}, err |
|
|
|
|
} |
|
|
|
|
conn.Close() |
|
|
|
|
|
|
|
|
|
conn, err = l.connect() |
|
|
|
|
if err != nil { |
|
|
|
|
return User{}, err |
|
|
|
|
} |
|
|
|
|
defer conn.Close() |
|
|
|
|
|
|
|
|
|
entry, err := l.searchUser(user, conn) |
|
|
|
@ -137,7 +143,7 @@ func (l Ldap) ListUsers() ([]User, error) {
|
|
|
|
|
defer conn.Close() |
|
|
|
|
|
|
|
|
|
searchRequest := ldap.NewSearchRequest( |
|
|
|
|
"ou=people,"+l.DC, |
|
|
|
|
"ou=People,"+l.DC, |
|
|
|
|
ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false, |
|
|
|
|
"(&(objectClass=posixAccount))", |
|
|
|
|
searchAttributes, |
|
|
|
@ -262,7 +268,7 @@ func (l Ldap) login(user string, password string) (*ldap.Conn, error) {
|
|
|
|
|
|
|
|
|
|
func (l Ldap) searchUser(user string, conn *ldap.Conn) (entry *ldap.Entry, err error) { |
|
|
|
|
searchRequest := ldap.NewSearchRequest( |
|
|
|
|
"ou=people,"+l.DC, |
|
|
|
|
"ou=People,"+l.DC, |
|
|
|
|
ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false, |
|
|
|
|
fmt.Sprintf("(&(objectClass=posixAccount)(uid=%s))", ldap.EscapeFilter(user)), |
|
|
|
|
searchAttributes, |
|
|
|
|