NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-16 12:38:17 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Postpone resolution of the request user until after DRF has run its own authentication

Browse Source
This commit is contained in:
Jeremy Stretch 2019-04-17 21:22:37 -04:00
parent 8d79353d9b
commit 79fa3ce6ab
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/extras/middleware.py
View File

@ -6,7 +6,7 @@ from datetime import timedelta
from django.conf import settings from django.conf import settings
from django.db.models.signals import post_delete, post_save from django.db.models.signals import post_delete, post_save
from django.utils import timezone from django.utils import timezone
from django.utils.functional import curry from django.utils.functional import curry, SimpleLazyObject
from extras.webhooks import enqueue_webhooks from extras.webhooks import enqueue_webhooks
from .constants import ( from .constants import (
@ -29,15 +29,14 @@ def cache_changed_object(instance, **kwargs):
def _record_object_deleted(request, instance, **kwargs): def _record_object_deleted(request, instance, **kwargs):
# Force resolution of request.user in case it's still a SimpleLazyObject. This seems to happen # Employ SimpleLazyObject to avoid resolving user until after DRF has performed its authentication.
# occasionally during tests, but haven't been able to determine why. user = SimpleLazyObject(lambda: request.user)
assert request.user.is_authenticated
# Record that the object was deleted # Record that the object was deleted
if hasattr(instance, 'log_change'): if hasattr(instance, 'log_change'):
instance.log_change(request.user, request.id, OBJECTCHANGE_ACTION_DELETE) instance.log_change(user, request.id, OBJECTCHANGE_ACTION_DELETE)
enqueue_webhooks(instance, request.user, request.id, OBJECTCHANGE_ACTION_DELETE) enqueue_webhooks(instance, user, request.id, OBJECTCHANGE_ACTION_DELETE)
class ObjectChangeMiddleware(object): class ObjectChangeMiddleware(object):