NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-24 16:26:09 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

11508 clear user groups

Browse Source
This commit is contained in:
Arthur 2023-08-10 18:23:07 +07:00
parent b2d1f3b14c
commit 96216cf1ec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/netbox/authentication.py
View File

@ -440,7 +440,7 @@ def azuread_map_groups(response, user, backend, *args, **kwargs):
is_staff = False is_staff = False
values = response.json().get('value', []) values = response.json().get('value', [])
user.groups.clear() user.groups.through.objects.filter(user=user).delete()
for value in values: for value in values:
# AD response contains both directories and groups - we only want groups # AD response contains both directories and groups - we only want groups
if value.get('@odata.type') == '#microsoft.graph.group': if value.get('@odata.type') == '#microsoft.graph.group':
@ -456,14 +456,16 @@ def azuread_map_groups(response, user, backend, *args, **kwargs):
if group_id in group_mapping: if group_id in group_mapping:
group_name = group_mapping[group_id] group_name = group_mapping[group_id]
group = Group.objects.get(name=group_name) try:
group = Group.objects.get(name=group_name)
except Group.DoesNotExist:
group = None
if group: if group:
group.user_set.add(user) group.user_set.add(user)
logger.info(f"Azure group mapping - adding group {group_name} to user: {user}.") logger.info(f"Azure group mapping - adding group {group_name} to user: {user}.")
else: else:
logger.info(f"Azure group mapping - group: {group_name} not found.") logger.info(f"Azure group mapping - group: {group_name} not found.")
else:
logger.info(f"Azure group mapping - no Microsoft graph groups returned for user {user}.")
user.is_superuser = is_superuser user.is_superuser = is_superuser
user.is_staff = is_staff user.is_staff = is_staff