From 006bf32b53caa539c41c9254078037cc134ac81e Mon Sep 17 00:00:00 2001 From: turly221 Date: Mon, 9 Dec 2024 16:43:47 +0000 Subject: [PATCH] commit patch 20759863 --- django/contrib/auth/tests/views.py | 8 ++++++-- django/utils/http.py | 7 ++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/django/contrib/auth/tests/views.py b/django/contrib/auth/tests/views.py index 603d380e9da5..6d7029bae850 100644 --- a/django/contrib/auth/tests/views.py +++ b/django/contrib/auth/tests/views.py @@ -309,7 +309,8 @@ def test_security_check(self, password='password'): for bad_url in ('http://example.com', 'https://example.com', 'ftp://exampel.com', - '//example.com'): + '//example.com', + 'javascript:alert("XSS")'): nasty_url = '%(url)s?%(next)s=%(bad_url)s' % { 'url': login_url, @@ -330,6 +331,7 @@ def test_security_check(self, password='password'): '/view?param=ftp://exampel.com', 'view/?param=//example.com', 'https:///', + 'HTTPS:///', '//testserver/', '/url%20with%20spaces/'): # see ticket #12534 safe_url = '%(url)s?%(next)s=%(good_url)s' % { @@ -467,7 +469,8 @@ def test_security_check(self, password='password'): for bad_url in ('http://example.com', 'https://example.com', 'ftp://exampel.com', - '//example.com'): + '//example.com', + 'javascript:alert("XSS")'): nasty_url = '%(url)s?%(next)s=%(bad_url)s' % { 'url': logout_url, 'next': REDIRECT_FIELD_NAME, @@ -486,6 +489,7 @@ def test_security_check(self, password='password'): '/view?param=ftp://exampel.com', 'view/?param=//example.com', 'https:///', + 'HTTPS:///', '//testserver/', '/url%20with%20spaces/'): # see ticket #12534 safe_url = '%(url)s?%(next)s=%(good_url)s' % { diff --git a/django/utils/http.py b/django/utils/http.py index d2e4eb5adbf0..21c84dc8214a 100644 --- a/django/utils/http.py +++ b/django/utils/http.py @@ -228,11 +228,12 @@ def same_origin(url1, url2): def is_safe_url(url, host=None): """ Return ``True`` if the url is a safe redirection (i.e. it doesn't point to - a different host). + a different host and uses a safe scheme). Always returns ``False`` on an empty url. """ if not url: return False - netloc = urlparse.urlparse(url)[1] - return not netloc or netloc == host + url_info = urlparse.urlparse(url) + return (not url_info[1] or url_info[1] == host) and \ + (not url_info[0] or url_info[0] in ['http', 'https'])