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

django/conf/global_settings.py

@@ -374 +374 @@
 
 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

@@ -69 +69 @@
     "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 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('.')
@@ -22 +23 @@
     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
 except ImportError:
@@ -76 +77 @@
     def __call__(self, request, *args, **kwargs):
         if self.test_func(request.user):
             return self.view_func(request, *args, **kwargs)
-        path = urlquote(request.get_full_path())
-        tup = self.login_url, self.redirect_field_name, path
-        return HttpResponseRedirect('%s?%s=%s' % tup)
+        login_url = list(urlparse.urlparse(self.login_url))
+        if login_url[1].lower() == request.META['SERVER_NAME'].lower():
+            path = urlquote(request.get_full_path())
+            login_url[1] = ''
+        else:
+            path = urlquote(request.build_absolute_uri())
+        if login_url[4]:
+            login_url[4] += '&'
+        login_url[4] += '%s=%s' % (self.redirect_field_name, path)
+        return HttpResponseRedirect(urlparse.urlunparse(login_url))