mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Simplify the aggregation of constraint sets

Browse Source
This commit is contained in:
Jeremy Stretch
2020-08-07 14:09:55 -04:00
parent 1dfed14bc9
commit aca3ca9d65
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/netbox/authentication.py
View File

@ -1,4 +1,5 @@
import logging
from collections import defaultdict
from django.conf import settings
from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as _RemoteUserBackend
@ -30,15 +31,12 @@ class ObjectPermissionBackend(ModelBackend):
).prefetch_related('object_types')
# Create a dictionary mapping permissions to their constraints
perms = dict()
perms = defaultdict(list)
for obj_perm in object_permissions:
for object_type in obj_perm.object_types.all():
for action in obj_perm.actions:
perm_name = f"{object_type.app_label}.{action}_{object_type.model}"
if perm_name in perms:
perms[perm_name].append(obj_perm.constraints)
else:
perms[perm_name] = [obj_perm.constraints]
perms[perm_name].extend(obj_perm.list_constraints())
return perms
@ -75,10 +73,7 @@ class ObjectPermissionBackend(ModelBackend):
obj_perm_constraints = self.get_all_permissions(user_obj)[perm]
constraints = Q()
for perm_constraints in obj_perm_constraints:
if type(perm_constraints) is list:
for c in obj_perm_constraints:
constraints |= Q(**c)
elif perm_constraints:
if perm_constraints:
constraints |= Q(**perm_constraints)
else:
# Found ObjectPermission with null constraints; allow model-level access