Make the root middleware only act on resolver 404s

matthiask · matthiask · commit 78338e1f2275 · 2022-03-02T15:27:31.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,9 @@ Change log
 
 .. _Next version: https://github.com/matthiask/feincms3/compare/3.2...main
 
+- Changed the root middleware to not act on 404 responses generated by views,
+  only on 404 responses generated by resolver failures.
+
 
 `3.2`_ (2022-03-01)
 ~~~~~~~~~~~~~~~~~~~
diff --git a/feincms3/root/middleware.py b/feincms3/root/middleware.py
@@ -40,6 +40,7 @@ def handler(request, page):
 from functools import wraps
 
 from django.http import HttpResponseRedirect
+from django.urls import is_valid_path
 
 
 def create_page_if_404_middleware(*, queryset, handler, language_code_redirect=False):
@@ -69,7 +70,7 @@ def create_page_if_404_middleware(*, queryset, handler, language_code_redirect=F
     def outer(get_response):
         def inner(request):
             response = get_response(request)
-            if response.status_code != 404:
+            if response.status_code != 404 or is_valid_path(request.path_info):
                 return response
             qs = queryset(request) if callable(queryset) else queryset._clone()
             if page := qs.filter(path=request.path_info).first():
diff --git a/tests/testapp/test_feincms3.py b/tests/testapp/test_feincms3.py
@@ -1334,3 +1334,20 @@ def test_404_language_code_redirect_deeper(self):
 
         response = self.client.get("/", HTTP_ACCEPT_LANGUAGE="en")
         self.assertEqual(response.status_code, 404)
+
+    def test_404_for_resolvable_path(self):
+        """404s from resolvable paths are not handled by the middleware"""
+
+        Page.objects.create(
+            title="test",
+            slug="test",
+            path="/not-found/",
+            static_path=True,
+            language_code="en",
+            is_active=True,
+        )
+
+        # 404 from view is forwarded; middleware only acts on non-resolvable
+        # paths
+        response = self.client.get("/not-found/")
+        self.assertEqual(response.status_code, 404)
diff --git a/tests/testapp/urls.py b/tests/testapp/urls.py
@@ -12,4 +12,5 @@ def not_found(request):
     path("i18n/", lambda request: HttpResponse(request.LANGUAGE_CODE))
 ) + [
     path("admin/", admin.site.urls),
+    path("not-found/", not_found),
 ]

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ def not_found(request):`
`12`	`12`	`path("i18n/", lambda request: HttpResponse(request.LANGUAGE_CODE))`
`13`	`13`	`) + [`
`14`	`14`	`path("admin/", admin.site.urls),`
	`15`	`+ path("not-found/", not_found),`
`15`	`16`	`]`