File size: 2,730 Bytes
8247f19 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | diff --git a/grappelli/views/switch.py b/grappelli/views/switch.py
index 8e390b13..db2ee680 100644
--- a/grappelli/views/switch.py
+++ b/grappelli/views/switch.py
@@ -8,6 +8,7 @@ from django.core.exceptions import ObjectDoesNotExist
from django.http import Http404
from django.shortcuts import redirect
from django.utils.html import escape
+from django.utils.http import url_has_allowed_host_and_scheme
from django.utils.translation import gettext_lazy as _
from grappelli.settings import SWITCH_USER_ORIGINAL, SWITCH_USER_TARGET
@@ -28,30 +29,35 @@ def switch_user(request, object_id):
# check redirect
redirect_url = request.GET.get("redirect", None)
- if redirect_url is None or not redirect_url.startswith("/"):
+ if redirect_url is None or not \
+ url_has_allowed_host_and_scheme(
+ url=redirect_url,
+ allowed_hosts={request.get_host()},
+ require_https=request.is_secure(),
+ ):
raise Http404()
-
+
# check original_user
try:
original_user = User.objects.get(pk=session_user["id"], is_staff=True)
if not SWITCH_USER_ORIGINAL(original_user):
messages.add_message(request, messages.ERROR, _("Permission denied."))
- return redirect(request.GET.get("redirect"))
+ return redirect(redirect_url)
except ObjectDoesNotExist:
msg = _('%(name)s object with primary key %(key)r does not exist.') % {'name': "User", 'key': escape(session_user["id"])}
messages.add_message(request, messages.ERROR, msg)
- return redirect(request.GET.get("redirect"))
+ return redirect(redirect_url)
# check new user
try:
target_user = User.objects.get(pk=object_id, is_staff=True)
if target_user != original_user and not SWITCH_USER_TARGET(original_user, target_user):
messages.add_message(request, messages.ERROR, _("Permission denied."))
- return redirect(request.GET.get("redirect"))
+ return redirect(redirect_url)
except ObjectDoesNotExist:
msg = _('%(name)s object with primary key %(key)r does not exist.') % {'name': "User", 'key': escape(object_id)}
messages.add_message(request, messages.ERROR, msg)
- return redirect(request.GET.get("redirect"))
+ return redirect(redirect_url)
# find backend
if not hasattr(target_user, 'backend'):
@@ -66,4 +72,4 @@ def switch_user(request, object_id):
if original_user.id != target_user.id:
request.session["original_user"] = {"id": original_user.id, "username": original_user.get_username()}
- return redirect(request.GET.get("redirect"))
+ return redirect(redirect_url)
|