Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2021
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
092d376
Report the associated filter if there is an error in LDAP
zeripath Sep 10, 2021
984fff4
Merge branch 'main' into improve-ldap-adminsearch-error
6543 Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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 <[email protected]>
  • Loading branch information
@zeripath
zeripath committed Sep 10, 2021
commit 092d376b0d074168481f83e1ece4ab2ab2f50fc4
4 changes: 2 additions & 2 deletions services/auth/source/ldap/source_search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down