sigb.us/ldap-proxy
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix looping over multiple entities or groups

Browse source
This commit is contained in:
signaryk 2024-07-05 16:16:02 -05:00
parent c2eca7ed43
commit ab4283ceac
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/ldap/search.go
View file

@ -80,9 +80,7 @@ func (s *server) handleSearchEntities(w ldap.ResponseWriter, m *ldap.Message) {
if exprAnd { if exprAnd {
e, complete, err = s.entitySearchResultWithMatch(ctx, ents[i], r.BaseObject(), r.Attributes(), matchGroup) e, complete, err = s.entitySearchResultWithMatch(ctx, ents[i], r.BaseObject(), r.Attributes(), matchGroup)
if !complete { if !complete {
res := ldap.NewSearchResultDoneResponse(ldap.LDAPResultSuccess) continue
w.Write(res)
return
} }
} else { } else {
e, err = s.entitySearchResult(ctx, ents[i], r.BaseObject(), r.Attributes()) e, err = s.entitySearchResult(ctx, ents[i], r.BaseObject(), r.Attributes())
@ -236,9 +234,7 @@ func (s *server) handleSearchGroups(w ldap.ResponseWriter, m *ldap.Message) {
s.l.Debug("Match UID: ", matchUid) s.l.Debug("Match UID: ", matchUid)
e, complete, err = s.groupSearchResultWithMatch(ctx, groups[i], r.BaseObject(), r.Attributes(), matchUid) e, complete, err = s.groupSearchResultWithMatch(ctx, groups[i], r.BaseObject(), r.Attributes(), matchUid)
if !complete { if !complete {
res := ldap.NewSearchResultDoneResponse(ldap.LDAPResultSuccess) continue
w.Write(res)
return
} }
} else { } else {
e, err = s.groupSearchResult(ctx, groups[i], r.BaseObject(), r.Attributes()) e, err = s.groupSearchResult(ctx, groups[i], r.BaseObject(), r.Attributes())