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

internal/ldap: Correctly handle multi-valued attributes

Browse source
This commit is contained in:
Michael Aldridge 2020-11-08 19:33:21 -08:00
parent 1b2e59b9be
commit 44d8cee507
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/ldap/search.go
View file

@ -85,10 +85,12 @@ func (s *server) entitySearchResult(ctx context.Context, e *pb.Entity, dn messag
return res, err return res, err
} }
memberOf := []message.AttributeValue{}
for i := range grps { for i := range grps {
g := "cn=" + grps[i].GetName() + ",ou=groups," + strings.Join(s.nc, ",") g := "cn=" + grps[i].GetName() + ",ou=groups," + strings.Join(s.nc, ",")
res.AddAttribute("memberOf", message.AttributeValue(g)) memberOf = append(memberOf, message.AttributeValue(g))
} }
res.AddAttribute("memberOf", memberOf...)
return res, nil return res, nil
} }
@ -149,10 +151,12 @@ func (s *server) groupSearchResult(ctx context.Context, g *pb.Group, dn message.
return res, err return res, err
} }
memberList := []message.AttributeValue{}
for i := range members { for i := range members {
g := "uid=" + members[i].GetID() + ",ou=entities," + strings.Join(s.nc, ",") g := "uid=" + members[i].GetID() + ",ou=entities," + strings.Join(s.nc, ",")
res.AddAttribute("member", message.AttributeValue(g)) memberList = append(memberList, message.AttributeValue(g))
} }
res.AddAttribute("member", memberList...)
return res, nil return res, nil
} }