NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-14 15:52:18 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #21032: Avoid subquery in RestrictedQuerySet where unnecessary

Browse Source
This commit is contained in:
Jeremy Stretch
2025-12-23 09:41:58 -05:00
parent ee2aa35cba
commit 93119f52c3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/utilities/querysets.py
View File

@@ -50,21 +50,21 @@ class RestrictedQuerySet(QuerySet):
# Bypass restriction for superusers and exempt views # Bypass restriction for superusers and exempt views
if user and user.is_superuser or permission_is_exempt(permission_required): if user and user.is_superuser or permission_is_exempt(permission_required):
qs = self return self
# User is anonymous or has not been granted the requisite permission # User is anonymous or has not been granted the requisite permission
elif user is None or not user.is_authenticated or permission_required not in user.get_all_permissions(): if user is None or not user.is_authenticated or permission_required not in user.get_all_permissions():
qs = self.none() return self.none()
# Filter the queryset to include only objects with allowed attributes # Filter the queryset to include only objects with allowed attributes
else: constraints = user._object_perm_cache[permission_required]
tokens = { tokens = {
CONSTRAINT_TOKEN_USER: user, CONSTRAINT_TOKEN_USER: user,
} }
attrs = qs_filter_from_constraints(user._object_perm_cache[permission_required], tokens) if attrs := qs_filter_from_constraints(constraints, tokens):
# #8715: Avoid duplicates when JOIN on many-to-many fields without using DISTINCT. # #8715: Avoid duplicates when JOIN on many-to-many fields without using DISTINCT.
# DISTINCT acts globally on the entire request, which may not be desirable. # DISTINCT acts globally on the entire request, which may not be desirable.
allowed_objects = self.model.objects.filter(attrs) allowed_objects = self.model.objects.filter(attrs)
qs = self.filter(pk__in=allowed_objects) return self.filter(pk__in=allowed_objects)
return qs return self