Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
19 changes: 19 additions & 0 deletions dojo/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,3 +338,22 @@ def _trigger_async_index_update(self, model_groups):
for i, batch in enumerate(batches, 1):
logger.debug(f"AsyncSearchContextMiddleware: Triggering batch {i}/{len(batches)} for {model_name}: {len(batch)} instances")
update_watson_search_index_for_model(model_name, batch)


class ApiTokenUsernameLoggingMiddleware:
"""
Middleware to set REMOTE_USER in uWSGI logs when using API Token authentication.
When using API tokens, uWSGI logs show '-' instead of the username.
This middleware sets the REMOTE_USER environ variable so uWSGI can log it correctly.
"""

def __init__(self, get_response):
self.get_response = get_response

def __call__(self, request):
response = self.get_response(request)
# After the request is processed, the user is authenticated
if request.user and request.user.is_authenticated:
# Set REMOTE_USER so uWSGI logs the username correctly
request.META["REMOTE_USER"] = request.user.username
return response
1 change: 1 addition & 0 deletions dojo/settings/settings.dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,7 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param
"django.middleware.security.SecurityMiddleware",
"django_permissions_policy.PermissionsPolicyMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
"dojo.middleware.ApiTokenUsernameLoggingMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"dojo.middleware.LoginRequiredMiddleware",
Expand Down
Loading