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

Closes #10718: Optimize object-based permissions enforcement

Browse Source
This commit is contained in:
jeremystretch
2022-10-21 12:39:03 -04:00
parent 96c4696417
commit 3d687a6c2d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/netbox/api/viewsets/mixins.py
View File

@ -108,6 +108,5 @@ class ObjectValidationMixin:
conforming_count = self.queryset.filter(pk__in=[obj.pk for obj in instance]).count() conforming_count = self.queryset.filter(pk__in=[obj.pk for obj in instance]).count()
if conforming_count != len(instance): if conforming_count != len(instance):
raise ObjectDoesNotExist raise ObjectDoesNotExist
else: elif not self.queryset.filter(pk=instance.pk).exists():
# Check that the instance is matched by the view's queryset raise ObjectDoesNotExist
self.queryset.get(pk=instance.pk)

4
netbox/netbox/views/generic/object_views.py
View File

@ -173,7 +173,7 @@ class ObjectImportView(GetReturnURLMixin, BaseObjectView):
obj = model_form.save() obj = model_form.save()
# Enforce object-level permissions # Enforce object-level permissions
if not self.queryset.filter(pk=obj.pk).first(): if not self.queryset.filter(pk=obj.pk).exists():
raise PermissionsViolation() raise PermissionsViolation()
# Iterate through the related object forms (if any), validating and saving each instance. # Iterate through the related object forms (if any), validating and saving each instance.
@ -390,7 +390,7 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
obj = form.save() obj = form.save()
# Check that the new object conforms with any assigned object-level permissions # Check that the new object conforms with any assigned object-level permissions
if not self.queryset.filter(pk=obj.pk).first(): if not self.queryset.filter(pk=obj.pk).exists():
raise PermissionsViolation() raise PermissionsViolation()
msg = '{} {}'.format( msg = '{} {}'.format(