Skip to content

Keep 404 legacy links on the legacy host #3018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
e-q wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Keep 404 legacy links on the legacy host #3018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/cms/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ class Test404(TestCase):
def test_legacy_path(self):
self.assertEqual(legacy_path("/any/thing"), "http://legacy.python.org/any/thing")

def test_legacy_path_with_encoded_slash(self):
self.assertEqual(legacy_path("/%2Fevil.test/x"), "http://legacy.python.org/%2Fevil.test/x")

def test_legacy_path_with_decoded_encoded_slash(self):
self.assertEqual(legacy_path("//evil.test/x"), "http://legacy.python.org//evil.test/x")

def test_custom_404(self):
"""Ensure custom 404 is set to 5 minutes"""
response = self.client.get("/foo-bar/baz/9876")
Expand Down
6 changes: 4 additions & 2 deletions apps/cms/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Views for the cms app, including custom error handlers."""

from urllib.parse import urljoin
from urllib.parse import quote

from django.shortcuts import render
from django.urls import reverse
Expand All @@ -11,7 +11,9 @@

def legacy_path(path):
"""Build a path to the same path under the legacy.python.org domain."""
return urljoin(LEGACY_PYTHON_DOMAIN, path)
if not path.startswith("/"):
path = f"/{path}"
return f"{LEGACY_PYTHON_DOMAIN}{quote(path, safe='/%')}"


def custom_404(request, exception, template_name="404.html"):
Expand Down