Proxito: use unresolver in 404 handler

readthedocs/core/unresolver.py

@@ -52,10 +52,11 @@ def __init__(self, project, version_slug, filename):
 
 
 class TranslationNotFoundError(UnresolverError):
-    def __init__(self, project, language, filename):
+    def __init__(self, project, language, filename, version_slug):
         self.project = project
         self.language = language
         self.filename = filename
+        self.version_slug = version_slug
 
 
 class InvalidPathForVersionedProjectError(UnresolverError):
@@ -264,7 +265,10 @@ def _match_multiversion_project(
             project = parent_project.translations.filter(language=language).first()
             if not project:
                 raise TranslationNotFoundError(
-                    project=parent_project, language=language, filename=file
+                    project=parent_project,
+                    language=language,
+                    filename=file,
+                    version_slug=version_slug,
                 )
 
         if external_version_slug and external_version_slug != version_slug:

readthedocs/proxito/tests/test_old_redirects.py

@@ -1039,7 +1039,16 @@ def test_redirect_prefix_crossdomain(self):
             self.assertEqual(r.status_code, 302, url)
             self.assertEqual(r["Location"], expected_location, url)
 
-        # These aren't even handled by Django.
+    def test_redirect_prefix_crossdomain_with_newline_chars(self):
+        fixture.get(
+            Redirect,
+            project=self.project,
+            redirect_type="prefix",
+            from_url="/",
+        )
+        # We make use of Django's URL resolve in the current implementation,
+        # which doesn't handle these chars and raises an exception
+        # instead of redirecting.
         urls = [
             # Trying to bypass the protocol check by including a `\n` char.
             "http://project.dev.readthedocs.io/http:/%0A/my.host/path.html",
@@ -1135,3 +1144,34 @@ def setUp(self):
             default_true=True,
             future_default_true=True,
         )
+
+    def test_redirect_prefix_crossdomain_with_newline_chars(self):
+        """
+        Overridden to make it compatible with the new implementation.
+
+        In the new implementation we will correctly redirect,
+        instead of raising an exception.
+        """
+        fixture.get(
+            Redirect,
+            project=self.project,
+            redirect_type="prefix",
+            from_url="/",
+        )
+        urls = [
+            (
+                "http://project.dev.readthedocs.io/http:/%0A/my.host/path.html",
+                "http://project.dev.readthedocs.io/en/latest/http://my.host/path.html",
+            ),
+            (
+                "http://project.dev.readthedocs.io/%0A/my.host/path.html",
+                "http://project.dev.readthedocs.io/en/latest/my.host/path.html",
+            ),
+        ]
+        for url, expected_location in urls:
+            r = self.client.get(
+                url,
+                HTTP_HOST="project.dev.readthedocs.io",
+            )
+            self.assertEqual(r.status_code, 302, url)
+            self.assertEqual(r["Location"], expected_location, url)

readthedocs/proxito/tests/test_redirects.py

@@ -1,7 +1,8 @@
 # Copied from .org test_redirects
-
 from django.test import override_settings
+from django_dynamic_fixture import get
 
+from readthedocs.projects.models import Feature
 from readthedocs.proxito.constants import RedirectType
 
 from .base import BaseDocServing
@@ -260,3 +261,15 @@ def test_slash_redirect(self):
         # WARNING
         # The test client strips multiple slashes at the front of the URL
         # Additional tests for this are in ``test_middleware:test_front_slash``
+
+
+class ProxitoV2RedirectTests(RedirectTests):
+    # TODO: remove this class once the new implementation is the default.
+    def setUp(self):
+        super().setUp()
+        get(
+            Feature,
+            feature_id=Feature.USE_UNRESOLVER_WITH_PROXITO,
+            default_true=True,
+            future_default_true=True,
+        )

readthedocs/proxito/tests/test_urls.py

@@ -3,8 +3,11 @@
 """Test URL config."""
 
 import pytest
-from django.test import TestCase, override_settings
+from django.test import TestCase
 from django.urls import resolve
+from django_dynamic_fixture import get
+
+from readthedocs.projects.models import Feature
 
 
 @pytest.mark.proxito
@@ -103,3 +106,15 @@ def test_single_version(self):
                 'filename': 'some/path/index.html',
             },
         )
+
+
+class ProxitoV2TestSingleVersionURLs(TestSingleVersionURLs):
+    # TODO: remove this class once the new implementation is the default.
+    def setUp(self):
+        super().setUp()
+        get(
+            Feature,
+            feature_id=Feature.USE_UNRESOLVER_WITH_PROXITO,
+            default_true=True,
+            future_default_true=True,
+        )