Skip to content

Commit

Permalink
[1.4.x] Fixed a security issue in http redirects. Disclosure and new …
Browse files Browse the repository at this point in the history
…release forthcoming.

Backport of 4129201 from master.
  • Loading branch information
apollo13 committed Jul 30, 2012
1 parent c14f325 commit e346850
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 12 deletions.
22 changes: 12 additions & 10 deletions django/http/__init__.py
Expand Up @@ -9,7 +9,7 @@

from pprint import pformat
from urllib import urlencode, quote
from urlparse import urljoin
from urlparse import urljoin, urlparse
try:
from cStringIO import StringIO
except ImportError:
Expand Down Expand Up @@ -114,7 +114,7 @@ def __init__(self, *args, **kwargs):

from django.conf import settings
from django.core import signing
from django.core.exceptions import ImproperlyConfigured
from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
from django.core.files import uploadhandler
from django.http.multipartparser import MultiPartParser
from django.http.utils import *
Expand Down Expand Up @@ -731,19 +731,21 @@ def tell(self):
raise Exception("This %s instance cannot tell its position" % self.__class__)
return sum([len(str(chunk)) for chunk in self._container])

class HttpResponseRedirect(HttpResponse):
status_code = 302
class HttpResponseRedirectBase(HttpResponse):
allowed_schemes = ['http', 'https', 'ftp']

def __init__(self, redirect_to):
super(HttpResponseRedirect, self).__init__()
super(HttpResponseRedirectBase, self).__init__()
parsed = urlparse(redirect_to)
if parsed.scheme and parsed.scheme not in self.allowed_schemes:
raise SuspiciousOperation("Unsafe redirect to URL with scheme '%s'" % parsed.scheme)
self['Location'] = iri_to_uri(redirect_to)

class HttpResponsePermanentRedirect(HttpResponse):
status_code = 301
class HttpResponseRedirect(HttpResponseRedirectBase):
status_code = 302

def __init__(self, redirect_to):
super(HttpResponsePermanentRedirect, self).__init__()
self['Location'] = iri_to_uri(redirect_to)
class HttpResponsePermanentRedirect(HttpResponseRedirectBase):
status_code = 301

class HttpResponseNotModified(HttpResponse):
status_code = 304
Expand Down
19 changes: 17 additions & 2 deletions tests/regressiontests/httpwrappers/tests.py
@@ -1,8 +1,11 @@
import copy
import pickle

from django.http import (QueryDict, HttpResponse, SimpleCookie, BadHeaderError,
parse_cookie)
from django.core.exceptions import SuspiciousOperation
from django.http import (QueryDict, HttpResponse, HttpResponseRedirect,
HttpResponsePermanentRedirect,
SimpleCookie, BadHeaderError,
parse_cookie)
from django.utils import unittest


Expand Down Expand Up @@ -296,6 +299,18 @@ def test_iter_content(self):
self.assertRaises(UnicodeEncodeError,
getattr, r, 'content')

def test_unsafe_redirect(self):
bad_urls = [
'data:text/html,<script>window.alert("xss")</script>',
'mailto:test@example.com',
'file:///etc/passwd',
]
for url in bad_urls:
self.assertRaises(SuspiciousOperation,
HttpResponseRedirect, url)
self.assertRaises(SuspiciousOperation,
HttpResponsePermanentRedirect, url)

class CookieTests(unittest.TestCase):
def test_encode(self):
"""
Expand Down

0 comments on commit e346850

Please sign in to comment.