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]>
go-gitea · Sep 10, 2021 · f394019 · f394019
1 parent 77f604a
commit f394019
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 {