Ticket #5340: 5340-redirect-forbidden-login-r7435.patch

trac/web/api.py

@@ -181 +181 @@
                       doc='The HTTP method of the request')
     path_info = property(fget=lambda self: self.environ.get('PATH_INFO', '').decode('utf-8'),
                          doc='Path inside the application')
+    query_string = property(fget=lambda self: self.environ.get('QUERY_STRING',
+                                                               ''),
+                            doc='Query part of the request')
     remote_addr = property(fget=lambda self: self.environ.get('REMOTE_ADDR'),
                            doc='IP address of the remote user')
     remote_user = property(fget=lambda self: self.environ.get('REMOTE_USER'),

trac/web/auth.py

@@ -197 +197 @@
 
     def _redirect_back(self, req):
         """Redirect the user back to the URL she came from."""
-        referer = req.get_header('Referer')
+        referer = self._referer(req)
         if referer and not (referer == req.base_url or \
                 referer.startswith(req.base_url.rstrip('/')+'/')):
             # only redirect to referer if it is from the same site
             referer = None
         req.redirect(referer or req.abs_href())
+
+    def _referer(self, req):
+        return req.args.get('referer', req.get_header('Referer'))
 
 
 class HTTPAuthentication(object):

trac/web/href.py

@@ -129 +129 @@
             if type(value) in (list, tuple):
                 for i in [i for i in value if i != None]:
                     params.append((name, i))
-            elif v != None:
+            elif value != None:
                 params.append((name, value))
 
         if args:

trac/web/main.py

@@ -437 +437 @@
         data = {'title': title, 'type': 'TracError', 'message': e.detail,
                 'frames': [], 'traceback': None}
         try:
+            if e.code == 403 and req.authname == 'anonymous':
+                referer = env.abs_href(req.path_info)
+                if req.query_string:
+                    referer += '?' + req.query_string
+                req.redirect(env.href('login', {'referer': referer}))
             req.send_error(sys.exc_info(), status=e.code, env=env, data=data)
         except RequestDone:
             pass