Skip to content
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

fix: map multiple user groups to one ad group #108

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −3
Open

fix: map multiple user groups to one ad group #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions helusers/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import logging
import uuid
from collections import defaultdict
from itertools import chain

from django.contrib.auth.models import AbstractUser as DjangoAbstractUser
from django.contrib.auth.models import Group
Expand Down Expand Up @@ -87,16 +89,18 @@ def sync_groups_from_ad(self):
"""Determine which Django groups to add or remove based on AD groups."""

ad_list = ADGroupMapping.objects.values_list("ad_group", "group")
mappings = {ad_group: group for ad_group, group in ad_list}
mappings = defaultdict(list)
for ad_group, group in ad_list:
mappings[ad_group].append(group)

user_ad_groups = set(
self.ad_groups.filter(groups__isnull=False).values_list(flat=True)
)
all_mapped_groups = set(mappings.values())
all_mapped_groups = set(chain(*mappings.values()))
old_groups = set(
self.groups.filter(id__in=all_mapped_groups).values_list(flat=True)
)
new_groups = set([mappings[x] for x in user_ad_groups])
new_groups = set(chain(*[mappings[x] for x in user_ad_groups]))

groups_to_delete = old_groups - new_groups
if groups_to_delete:
Expand Down
26 changes: 26 additions & 0 deletions helusers/tests/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,32 @@ class TestUserAdGroups:
[],
id="all_removed",
),
# many ad-group for 1 user group
pytest.param(
(
("ad_group_1", "group_1"),
("ad_group_2", "group_1"),
("ad_group_3", "group_1"),
),
[],
[],
["ad_group_1", "ad_group_2", "ad_group_3"],
["group_1"],
id="one-ad-for-many-group",
),
# 1 ad-group for many user groups
pytest.param(
(
("ad_group_1", "group_1"),
("ad_group_1", "group_2"),
("ad_group_1", "group_3"),
),
[],
[],
["ad_group_1"],
["group_1", "group_2", "group_3"],
id="many-ad-for-one-group",
),
],
)
def test_update_ad_groups(
Expand Down
Loading