globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Fix bug on groups with non-existent members

Browse source
This commit is contained in:
Camille 2021-10-29 14:19:46 +02:00
parent e9434e0e8c
commit 402a16f9f3
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
canaille/models.py
View file

@ -171,7 +171,11 @@ class Group(LDAPObject):
return self[attribute][0]
def get_members(self, conn=None):
return [User.get(dn=user_dn, conn=conn) for user_dn in self.member]
return [
User.get(dn=user_dn, conn=conn)
for user_dn in self.member
if User.get(dn=user_dn, conn=conn)
]
def add_member(self, user, conn=None):
self.member = self.member + [user.dn]

19
tests/test_groups.py
View file

@ -98,3 +98,22 @@ def test_simple_user_cannot_view_or_edit_groups(
testclient.get("/groups", status=403)
testclient.get("/groups/add", status=403)
testclient.get("/groups/foo", status=403)
def test_get_members_filters_non_existent_user(
testclient, slapd_connection, logged_moderator, foo_group, user
):
# an LDAP group can be inconsistent by containing members which doesn't exist
with testclient.app.app_context():
non_existent_user_dn = user.dn.replace(user.name, "yolo")
foo_group.member = foo_group.member + [non_existent_user_dn]
foo_group.save(conn=slapd_connection)
with testclient.app.app_context():
foo_members = foo_group.get_members(conn=slapd_connection)
assert foo_group.member == [user.dn, non_existent_user_dn]
assert len(foo_members) == 1
assert foo_members[0].dn == user.dn
testclient.get("/groups/foo", status=200)