Skip to content

Commit f394019

Browse files
authored
Report the associated filter if there is an error in LDAP (#17014)
If there is an error when performing the admin or restricted filter search ensure that the filter and the userDN are reported. Signed-off-by: Andrew Thornton <[email protected]>
1 parent 77f604a commit f394019

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

services/auth/source/ldap/source_search.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func checkAdmin(l *ldap.Conn, ls *Source, userDN string) bool {
156156
sr, err := l.Search(search)
157157

158158
if err != nil {
159-
log.Error("LDAP Admin Search failed unexpectedly! (%v)", err)
159+
log.Error("LDAP Admin Search with filter %s for %s failed unexpectedly! (%v)", ls.AdminFilter, userDN, err)
160160
} else if len(sr.Entries) < 1 {
161161
log.Trace("LDAP Admin Search found no matching entries.")
162162
} else {
@@ -181,7 +181,7 @@ func checkRestricted(l *ldap.Conn, ls *Source, userDN string) bool {
181181
sr, err := l.Search(search)
182182

183183
if err != nil {
184-
log.Error("LDAP Restrictred Search failed unexpectedly! (%v)", err)
184+
log.Error("LDAP Restrictred Search with filter %s for %s failed unexpectedly! (%v)", ls.RestrictedFilter, userDN, err)
185185
} else if len(sr.Entries) < 1 {
186186
log.Trace("LDAP Restricted Search found no matching entries.")
187187
} else {

0 commit comments

Comments
 (0)