From 8dde4e5b941d41397ffd5d31c2eac34f682e124a Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Thu, 4 Aug 2022 09:58:37 +0200 Subject: [PATCH] Add LDAP query details to debug log --- services/graph/pkg/identity/ldap.go | 40 +++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/services/graph/pkg/identity/ldap.go b/services/graph/pkg/identity/ldap.go index e0f87bab55..2dc3f23d3c 100644 --- a/services/graph/pkg/identity/ldap.go +++ b/services/graph/pkg/identity/ldap.go @@ -315,7 +315,13 @@ func (i *LDAP) getEntryByDN(dn string, attrs []string) (*ldap.Entry, error) { nil, ) - i.logger.Debug().Str("backend", "ldap").Str("dn", dn).Msg("Search user by DN") + i.logger.Debug().Str("backend", "ldap"). + Str("base", searchRequest.BaseDN). + Str("filter", searchRequest.Filter). + Int("scope", searchRequest.Scope). + Int("sizelimit", searchRequest.SizeLimit). + Interface("attributes", searchRequest.Attributes). + Msg("getEntryByDN") res, err := i.conn.Search(searchRequest) if err != nil { @@ -353,7 +359,13 @@ func (i *LDAP) getLDAPUserByFilter(filter string) (*ldap.Entry, error) { }, nil, ) - i.logger.Debug().Str("backend", "ldap").Msgf("Search %s", i.userBaseDN) + i.logger.Debug().Str("backend", "ldap"). + Str("base", searchRequest.BaseDN). + Str("filter", searchRequest.Filter). + Int("scope", searchRequest.Scope). + Int("sizelimit", searchRequest.SizeLimit). + Interface("attributes", searchRequest.Attributes). + Msg("getLDAPUserByFilter") res, err := i.conn.Search(searchRequest) if err != nil { @@ -425,7 +437,13 @@ func (i *LDAP) GetUsers(ctx context.Context, queryParam url.Values) ([]*libregra }, nil, ) - i.logger.Debug().Str("backend", "ldap").Msgf("Search %s", i.userBaseDN) + i.logger.Debug().Str("backend", "ldap"). + Str("base", searchRequest.BaseDN). + Str("filter", searchRequest.Filter). + Int("scope", searchRequest.Scope). + Int("sizelimit", searchRequest.SizeLimit). + Interface("attributes", searchRequest.Attributes). + Msg("GetUsers") res, err := i.conn.Search(searchRequest) if err != nil { return nil, errorcode.New(errorcode.ItemNotFound, err.Error()) @@ -543,7 +561,13 @@ func (i *LDAP) getLDAPGroupsByFilter(filter string, requestMembers, single bool) attrs, nil, ) - i.logger.Debug().Str("backend", "ldap").Msgf("Search %s", i.groupBaseDN) + i.logger.Debug().Str("backend", "ldap"). + Str("base", searchRequest.BaseDN). + Str("filter", searchRequest.Filter). + Int("scope", searchRequest.Scope). + Int("sizelimit", searchRequest.SizeLimit). + Interface("attributes", searchRequest.Attributes). + Msg("getLDAPGroupsByFilter") res, err := i.conn.Search(searchRequest) if err != nil { @@ -624,7 +648,13 @@ func (i *LDAP) GetGroups(ctx context.Context, queryParam url.Values) ([]*libregr }, nil, ) - i.logger.Debug().Str("backend", "ldap").Str("Base", i.groupBaseDN).Str("filter", groupFilter).Msg("ldap search") + i.logger.Debug().Str("backend", "ldap"). + Str("base", searchRequest.BaseDN). + Str("filter", searchRequest.Filter). + Int("scope", searchRequest.Scope). + Int("sizelimit", searchRequest.SizeLimit). + Interface("attributes", searchRequest.Attributes). + Msg("GetGroups") res, err := i.conn.Search(searchRequest) if err != nil { return nil, errorcode.New(errorcode.ItemNotFound, err.Error())