Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Report the associated filter if there is an error in LDAP (#17014)

Browse source 
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 <art27@cantab.net>
This commit is contained in:
zeripath 2021-09-10 23:46:27 +01:00 committed by GitHub
parent 77f604a928
commit f394019e9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/auth/source/ldap/source_search.go
View file

@ -156,7 +156,7 @@ func checkAdmin(l *ldap.Conn, ls *Source, userDN string) bool {
sr, err := l.Search(search) sr, err := l.Search(search)
if err != nil { 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 { } else if len(sr.Entries) < 1 {
log.Trace("LDAP Admin Search found no matching entries.") log.Trace("LDAP Admin Search found no matching entries.")
} else { } else {
@ -181,7 +181,7 @@ func checkRestricted(l *ldap.Conn, ls *Source, userDN string) bool {
sr, err := l.Search(search) sr, err := l.Search(search)
if err != nil { 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 { } else if len(sr.Entries) < 1 {
log.Trace("LDAP Restricted Search found no matching entries.") log.Trace("LDAP Restricted Search found no matching entries.")
} else { } else {