Ticket #11025: django-contrib-auth-absolute-login-url.2.patch

django/conf/global_settings.py

@@ -467 +467 @@
 
 LOGIN_REDIRECT_URL = '/accounts/profile/'
 
+REDIRECT_FIELD_NAME = 'next'
+
 # The number of days a password reset link is valid for
 PASSWORD_RESET_TIMEOUT_DAYS = 3
 

django/contrib/auth/views.py

@@ -92 +92 @@
     "Redirects the user to the login page, passing the given 'next' page"
     if not login_url:
         login_url = settings.LOGIN_URL
-    return HttpResponseRedirect('%s?%s=%s' % (login_url, urlquote(redirect_field_name), urlquote(next)))
+    if '?' in login_url:
+        login_url += '&'
+    else:
+        login_url += '?'
+    return HttpResponseRedirect('%s%s=%s' % (login_url, urlquote(redirect_field_name), urlquote(next)))
 
 # 4 views for password reset:
 # - password_reset sends the mail

django/contrib/auth/__init__.py

@@ -1 +1 @@
 import datetime
 from warnings import warn
+from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.importlib import import_module
 
 SESSION_KEY = '_auth_user_id'
 BACKEND_SESSION_KEY = '_auth_user_backend'
-REDIRECT_FIELD_NAME = 'next'
+REDIRECT_FIELD_NAME = settings.REDIRECT_FIELD_NAME
 
 def load_backend(path):
     i = path.rfind('.')
@@ -35 +36 @@
     return cls()
 
 def get_backends():
-    from django.conf import settings
     backends = []
     for backend_path in settings.AUTHENTICATION_BACKENDS:
         backends.append(load_backend(backend_path))

django/contrib/auth/decorators.py

@@ +1 @@
+import urlparse
+
 try:
     from functools import update_wrapper, wraps
 except ImportError:
@@ -22 +24 @@
         def _wrapped_view(request, *args, **kwargs):
             if test_func(request.user):
                 return view_func(request, *args, **kwargs)
-            path = urlquote(request.get_full_path())
-            tup = login_url, redirect_field_name, path
-            return HttpResponseRedirect('%s?%s=%s' % tup)
+            url = urlparse.urlsplit(login_url)
+            scheme, hostname = url.scheme, url.netloc
+            if hostname.lower() == request.META['SERVER_NAME'].lower():
+                retpath = urlquote(request.get_full_path())
+                hostname = ''
+                scheme = ''
+            else:
+                retpath = urlquote(request.build_absolute_uri())
+            query = url.query
+            if query:
+                query += '&'
+            query += '%s=%s' % (redirect_field_name, retpath)
+            return HttpResponseRedirect(urlparse.urlunsplit(urlparse.SplitResult(
+                scheme = scheme,
+                netloc = hostname,
+                path = url.path,
+                query = query,
+                fragment = ''
+            )))
         return wraps(view_func)(_wrapped_view)
     return decorator