NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 17:08:41 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixes: #16973 - Resolve $user token to User.id for use in permissions based on custom fields (#17268)

Browse Source 
* Resolve $user token to User.id for use in permissions based on custom fields

* Cleaner type check

* Simplify User object check by updating tokens instead of resolved values
This commit is contained in:
bctiemann 2024-08-26 16:41:58 -04:00 committed by GitHub
parent ee0af15073
commit a7f83de8c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/utilities/permissions.py
View File

@ -1,7 +1,10 @@
from django.conf import settings from django.conf import settings
from django.apps import apps
from django.db.models import Q from django.db.models import Q
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from users.constants import CONSTRAINT_TOKEN_USER
__all__ = ( __all__ = (
'get_permission_for_model', 'get_permission_for_model',
'permission_is_exempt', 'permission_is_exempt',
@ -90,6 +93,11 @@ def qs_filter_from_constraints(constraints, tokens=None):
if tokens is None: if tokens is None:
tokens = {} tokens = {}
User = apps.get_model('users.User')
for token, value in tokens.items():
if token == CONSTRAINT_TOKEN_USER and isinstance(value, User):
tokens[token] = value.id
def _replace_tokens(value, tokens): def _replace_tokens(value, tokens):
if type(value) is list: if type(value) is list:
return list(map(lambda v: tokens.get(v, v), value)) return list(map(lambda v: tokens.get(v, v), value))