From 5649556a3368d3b9fbf8cdb89d04a1c6154c529a Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Tue, 16 Feb 2016 12:36:40 +0100 Subject: [PATCH] LDAP: Make a bit more detailed log traces This is useful especially to check whether we fetch right attributes, using right LDAP search base and in right order. --- modules/auth/ldap/ldap.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index 376092fcb05..8a8cb89b673 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -78,7 +78,7 @@ func (ls *Source) findUserDN(l *ldap.Conn, name string) (string, bool) { return "", false } - log.Trace("Searching using filter %s", userFilter) + log.Trace("Searching for DN using filter %s and base %s", userFilter, ls.UserBase) search := ldap.NewSearchRequest( ls.UserBase, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false, userFilter, []string{}, nil) @@ -144,6 +144,7 @@ func (ls *Source) SearchEntry(name, passwd string, directBind bool) (string, str return "", "", "", "", false, false } + log.Trace("Fetching attributes '%v', '%v', '%v', '%v' with filter %s and base %s", ls.AttributeUsername, ls.AttributeName, ls.AttributeSurname, ls.AttributeMail, userFilter, userDN) search := ldap.NewSearchRequest( userDN, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false, userFilter, []string{ls.AttributeUsername, ls.AttributeName, ls.AttributeSurname, ls.AttributeMail}, @@ -170,6 +171,7 @@ func (ls *Source) SearchEntry(name, passwd string, directBind bool) (string, str admin_attr := false if len(ls.AdminFilter) > 0 { + log.Trace("Checking admin with filter %s and base %s", ls.AdminFilter, userDN) search = ldap.NewSearchRequest( userDN, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false, ls.AdminFilter, []string{ls.AttributeName},