Ticket #987: redirect_absoluteuri.2.patch

django/core/handlers/base.py

@@ -3 +3 @@
 from django import http
 import sys
 
+class BaseCompulsaryMiddleware(object):
+    def process_response(self, request, response):
+        # Absolute URI redirects: Ensures that any redirect attempt (which uses
+        # the HTTP Location header) to a relative location is converted to an
+        # absolute URI, as required by RFC 2616, section 14.30.
+        # This is only possible if the host name can be gleaned from request.
+        if 'Location' in response.headers and http.get_host(request):
+            response['Location'] = request.build_absolute_uri(response['Location'])
+        return response
+
 class BaseHandler(object):
+    compulsary_middleware = BaseCompulsaryMiddleware
+
     def __init__(self):
         self._request_middleware = self._view_middleware = self._response_middleware = self._exception_middleware = None
 
@@ -15 +27 @@
         """
         from django.conf import settings
         from django.core import exceptions
-        self._request_middleware = []
-        self._view_middleware = []
-        self._response_middleware = []
-        self._exception_middleware = []
+
+        middleware_classes = [self.compulsary_middleware]
         for middleware_path in settings.MIDDLEWARE_CLASSES:
             try:
                 dot = middleware_path.rindex('.')
@@ -30 +40 @@
             except ImportError, e:
                 raise exceptions.ImproperlyConfigured, 'Error importing middleware %s: "%s"' % (mw_module, e)
             try:
-                mw_class = getattr(mod, mw_classname)
+                middleware_classes.append(getattr(mod, mw_classname))
             except AttributeError:
                 raise exceptions.ImproperlyConfigured, 'Middleware module "%s" does not define a "%s" class' % (mw_module, mw_classname)
 
+        self._request_middleware = []
+        self._view_middleware = []
+        self._response_middleware = []
+        self._exception_middleware = []
+        for mw_class in middleware_classes:
             try:
                 mw_instance = mw_class()
             except exceptions.MiddlewareNotUsed:
                 continue
-
             if hasattr(mw_instance, 'process_request'):
                 self._request_middleware.append(mw_instance.process_request)
             if hasattr(mw_instance, 'process_view'):

django/http/__init__.py

@@ -2 +2 @@
 from Cookie import SimpleCookie
 from pprint import pformat
 from urllib import urlencode, quote
+from urlparse import urljoin
 from django.utils.datastructures import MultiValueDict
 
 RESERVED_CHARS="!*'();:@&=+$,/?%#[]"
@@ -39 +40 @@
     def get_full_path(self):
         return ''
 
+    def build_absolute_uri(self, location=None):
+        """
+        Builds an absolute URI from the location and the variables available in
+        this request. If no location is specified, the absolute URI is built on
+        ``request.get_full_path()``.
+        """
+        if not location:
+            location = request.get_full_path()
+        if not ':' in location:
+            current_uri = '%s://%s%s' % (self.is_secure() and 'https' or 'http',
+                                         get_host(self), self.path)
+            location = urljoin(current_uri, location)
+        return location
+
     def is_secure(self):
         return os.environ.get("HTTPS") == "on"
 

django/test/testcases.py

@@ -57 +57 @@
         self._pre_setup()
         super(TestCase, self).__call__(result)
 
-    def assertRedirects(self, response, expected_path, status_code=302, target_status_code=200):
+    def assertRedirects(self, response, expected_url, status_code=302, target_status_code=200):
         """Assert that a response redirected to a specific URL, and that the
         redirect URL can be loaded.
         
@@ -65 +65 @@
         self.assertEqual(response.status_code, status_code, 
             "Response didn't redirect as expected: Reponse code was %d (expected %d)" % 
                 (response.status_code, status_code))
-        scheme, netloc, path, params, query, fragment = urlparse(response['Location'])
-        self.assertEqual(path, expected_path, 
-            "Response redirected to '%s', expected '%s'" % (path, expected_path))
+        url = response['Location']
+        scheme, netloc, path, params, query, fragment = urlparse(url)
+        self.assertEqual(url, expected_url, 
+            "Response redirected to '%s', expected '%s'" % (url, expected_url))
         redirect_response = self.client.get(path)
         self.assertEqual(redirect_response.status_code, target_status_code, 
             "Couldn't retrieve redirection page '%s': response code was %d (expected %d)" % 

docs/request_response.txt

@@ -151 +151 @@
 
    Example: ``"/music/bands/the_beatles/?print=true"``
 
+``build_absolute_uri(location)``
+   Returns an absolute URI from the location. If no location is provided, the
+   location will be set to ``request.get_full_path()``.
+
+   If the location is already an absolute URI, it will not be altered,
+   otherwise the absolute URI is built using the server variables available in
+   this request.
+
+   Example: ``"http://example.com/music/bands/the_beatles/?print=true"``
+
 ``is_secure()``
    Returns ``True`` if the request is secure; that is, if it was made with
    HTTPS.

tests/modeltests/test_client/models.py

@@ -78 +78 @@
 
     def test_redirect(self):
         "GET a URL that redirects elsewhere"
-        response = self.client.get('/test_client/redirect_view/')
-        
+        response = self.client.get('/test_client/redirect_view/')        
         # Check that the response was a 302 (redirect)
         self.assertRedirects(response, '/test_client/get_view/')
+        
+        client_providing_host = Client(HTTP_HOST='django.testserver')
+        response = client_providing_host.get('/test_client/redirect_view/')
+        # Check that the response was a 302 (redirect) with absolute URI
+        self.assertRedirects(response, 'http://django.testserver/test_client/get_view/')
 
     def test_permanent_redirect(self):
         "GET a URL that redirects permanently elsewhere"
         response = self.client.get('/test_client/permanent_redirect_view/')
-        
         # Check that the response was a 301 (permanent redirect)
         self.assertRedirects(response, '/test_client/get_view/', status_code=301)
 
+        client_providing_host = Client(HTTP_HOST='django.testserver')
+        response = client_providing_host.get('/test_client/permanent_redirect_view/')
+        # Check that the response was a 301 (permanent redirect) with absolute URI
+        self.assertRedirects(response, 'http://django.testserver/test_client/get_view/', status_code=301)
+
     def test_redirect_to_strange_location(self):
         "GET a URL that redirects to a non-200 page"
         response = self.client.get('/test_client/double_redirect_view/')
@@ -208 +216 @@
         
         # Get the page without logging in. Should result in 302.
         response = self.client.get('/test_client/login_protected_view/')
-        self.assertRedirects(response, '/accounts/login/')
+        self.assertRedirects(response, '/accounts/login/?next=/test_client/login_protected_view/')
         
         # Log in
         self.client.login(username='testclient', password='password')