Include query params in 404 redirects

readthedocs/proxito/tests/handler_404_urls.py

@@ -25,7 +25,7 @@ def inner_view(request, exception, *args, **kwargs):
         return view_func(
             request,
             *args,
-            proxito_path=request.get_full_path(),
+            proxito_path=request.path,
             **kwargs,
         )
     return inner_view

readthedocs/proxito/tests/test_full.py

@@ -333,8 +333,7 @@ def test_directory_indexes_get_args(self):
         self.project.versions.update(active=True, built=True)
         # Confirm we've serving from storage for the `index-exists/index.html` file
         response = self.client.get(
-            reverse('proxito_404_handler', kwargs={
-                    'proxito_path': '/en/latest/index-exists?foo=bar'}),
+            reverse('proxito_404_handler', kwargs={'proxito_path': '/en/latest/index-exists'}) + '?foo=bar',
             HTTP_HOST='project.readthedocs.io',
         )
         self.assertEqual(

readthedocs/proxito/views/mixins.py

@@ -205,6 +205,8 @@ def get_redirect_response(self, request, redirect_path, proxito_path, http_statu
         """
 
         schema, netloc, path, params, query, fragments = urlparse(proxito_path)
+        # `proxito_path` doesn't include query params.
+        query = urlparse(request.get_full_path()).query
         new_path = urlunparse((schema, netloc, redirect_path, params, query, fragments))
 
         # Re-use the domain and protocol used in the current request.

readthedocs/proxito/views/serve.py

@@ -235,7 +235,13 @@ def get(self, request, proxito_path, template_name='404.html'):
                     new_path = parts.path.rstrip('/') + f'/{tryfile}'
                 else:
                     new_path = parts.path.rstrip('/') + '/'
-                new_parts = parts._replace(path=new_path)
+
+                # `proxito_path` doesn't include query params.`
+                query = urlparse(request.get_full_path()).query
+                new_parts = parts._replace(
+                    path=new_path,
+                    query=query,
+                )
                 redirect_url = new_parts.geturl()
 
                 # TODO: decide if we need to check for infinite redirect here