Add APPEND_SLASH handling to the root middleware

matthiask · matthiask · commit f1b3402751e3 · 2022-04-11T19:45:26.000+02:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -18,6 +18,10 @@ Change log
 - Imported the ``old_richtext`` module to ``feincms3.plugins`` as long as it is
   available.
 - Changed the linked CKEditor version to 4.18.0.
+- Added ``APPEND_SLASH`` handling to the middleware created by
+  :func:`feincms3.root.middleware.create_page_if_404_middleware`. This has to
+  be done explicitly because valid page paths aren't resolvable when using a
+  middleware.
 
 
 `3.4`_ (2022-03-10)
diff --git a/feincms3/root/middleware.py b/feincms3/root/middleware.py
@@ -40,7 +40,12 @@ def handler(request, page):
 
 from functools import wraps
 
-from django.http import HttpResponseNotFound, HttpResponseRedirect
+from django.conf import settings
+from django.http import (
+    HttpResponseNotFound,
+    HttpResponsePermanentRedirect,
+    HttpResponseRedirect,
+)
 
 
 class _UseRootMiddlewareResponse(HttpResponseNotFound):
@@ -90,6 +95,10 @@ def inner(request):
                 target = f"/{request.LANGUAGE_CODE}/"
                 if qs.filter(path=target).exists():
                     return HttpResponseRedirect(target)
+            if settings.APPEND_SLASH and not request.path_info.endswith("/"):
+                target = request.path + "/"
+                if qs.filter(path=target).exists():
+                    return HttpResponsePermanentRedirect(target)
             return response
 
         return inner
diff --git a/tests/testapp/test_feincms3.py b/tests/testapp/test_feincms3.py
@@ -9,7 +9,7 @@
 from django.forms.models import modelform_factory
 from django.template import Context, Template, TemplateSyntaxError
 from django.test import Client, RequestFactory, TestCase
-from django.test.utils import isolate_apps
+from django.test.utils import isolate_apps, override_settings
 from django.urls import NoReverseMatch, reverse, set_urlconf
 from django.utils.translation import deactivate_all, override
 
@@ -1459,3 +1459,29 @@ def test_404_for_resolvable_app_path(self):
         # Page exists at URL but doesn't override the 404 generated by the blog app
         response = self.client.get("/blog/0/")
         self.assertEqual(response.status_code, 404)
+
+    def test_append_slash(self):
+        """Requests without slash are redirected if APPEND_SLASH and target exists"""
+
+        Page.objects.create(
+            title="home",
+            slug="home",
+            path="/home/",
+            static_path=True,
+            language_code="de",
+            is_active=True,
+            menu="main",
+        )
+
+        with override_settings(APPEND_SLASH=True):
+            response = self.client.get("/home")
+            self.assertRedirects(
+                response, "/home/", fetch_redirect_response=False, status_code=301
+            )
+
+            response = self.client.get("/blub")
+            self.assertEqual(response.status_code, 404)
+
+        with override_settings(APPEND_SLASH=False):
+            response = self.client.get("/home")
+            self.assertEqual(response.status_code, 404)
