Fix root passthru after 285f0bc

matthiask · matthiask · commit 2a8bcf7a86c1 · 2022-03-02T15:47:47.000+01:00
diff --git a/feincms3/root/middleware.py b/feincms3/root/middleware.py
@@ -70,7 +70,12 @@ 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 or is_valid_path(request.path_info):
+            if response.status_code != 404 or (
+                not getattr(response, "_root_middleware", False)
+                and is_valid_path(request.path_info)
+            ):
+                # Response is not a 404 OR the path can be resolved and running
+                # the middleware hasn't been requested explicitly.
                 return response
             qs = queryset(request) if callable(queryset) else queryset._clone()
             if page := qs.filter(path=request.path_info).first():
diff --git a/feincms3/root/passthru.py b/feincms3/root/passthru.py
@@ -41,15 +41,15 @@
 from feincms3.applications import reverse_app
 
 
+def passthru(request):
+    response = HttpResponseNotFound()
+    # Trigger the root middleware
+    response._root_middleware = True
+    return response
+
+
 app_name = "passthru"
-urlpatterns = [
-    path(
-        "",
-        # Trigger the page_if_404_middleware
-        lambda request: HttpResponseNotFound(),
-        name="passthru",
-    ),
-]
+urlpatterns = [path("", passthru, name="passthru")]
 
 
 def reverse_passthru(namespace, **kwargs):
