Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 26, 2024
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05bcfd7
Resolve $user token to User.id for use in permissions based on custom…
bctiemann Aug 26, 2024
8f5162e
Cleaner type check
bctiemann Aug 26, 2024
5e6aab3
Simplify User object check by updating tokens instead of resolved values
bctiemann Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions netbox/utilities/permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
from django.conf import settings
from django.apps import apps
from django.db.models import Q
from django.utils.translation import gettext_lazy as _

from users.constants import CONSTRAINT_TOKEN_USER

__all__ = (
'get_permission_for_model',
'permission_is_exempt',
Expand Down Expand Up @@ -90,6 +93,11 @@ def qs_filter_from_constraints(constraints, tokens=None):
if tokens is None:
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):
if type(value) is list:
return list(map(lambda v: tokens.get(v, v), value))
Expand Down