From 092d376b0d074168481f83e1ece4ab2ab2f50fc4 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 10 Sep 2021 18:10:47 +0100 Subject: [PATCH] Report the associated filter if there is an error in LDAP 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 --- services/auth/source/ldap/source_search.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/auth/source/ldap/source_search.go b/services/auth/source/ldap/source_search.go index f2acbb0d4b894..71db0b770a3f6 100644 --- a/services/auth/source/ldap/source_search.go +++ b/services/auth/source/ldap/source_search.go @@ -156,7 +156,7 @@ func checkAdmin(l *ldap.Conn, ls *Source, userDN string) bool { sr, err := l.Search(search) if err != nil { - log.Error("LDAP Admin Search failed unexpectedly! (%v)", err) + log.Error("LDAP Admin Search with filter %s for %s failed unexpectedly! (%v)", ls.AdminFilter, userDN, err) } else if len(sr.Entries) < 1 { log.Trace("LDAP Admin Search found no matching entries.") } else { @@ -181,7 +181,7 @@ func checkRestricted(l *ldap.Conn, ls *Source, userDN string) bool { sr, err := l.Search(search) if err != nil { - log.Error("LDAP Restrictred Search failed unexpectedly! (%v)", err) + log.Error("LDAP Restrictred Search with filter %s for %s failed unexpectedly! (%v)", ls.RestrictedFilter, userDN, err) } else if len(sr.Entries) < 1 { log.Trace("LDAP Restricted Search found no matching entries.") } else {