wagtail 6.3.2__py3-none-any.whl → 6.4rc1__py3-none-any.whl

wagtail/wagtail_hooks.py

@@ -1,19 +1,26 @@
+from typing import TYPE_CHECKING
+
 from django.conf import settings
 from django.contrib.auth.models import Permission
 from django.contrib.auth.views import redirect_to_login
 from django.db import models
 from django.urls import reverse
+from django.utils.cache import add_never_cache_headers
 from django.utils.text import capfirst
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 
 from wagtail import hooks
+from wagtail.compat import HTTPMethod
 from wagtail.coreutils import get_content_languages
 from wagtail.log_actions import LogFormatter
 from wagtail.models import ModelLogEntry, Page, PageLogEntry, PageViewRestriction
 from wagtail.rich_text.pages import PageLinkHandler
 from wagtail.utils.timestamps import parse_datetime_localized, render_timestamp
 
+if TYPE_CHECKING:
+    from django.http import HttpRequest
+
 
 def require_wagtail_login(next):
     login_url = getattr(
@@ -22,35 +29,51 @@ def require_wagtail_login(next):
     return redirect_to_login(next, login_url)
 
 
-@hooks.register("before_serve_page")
-def check_view_restrictions(page, request, serve_args, serve_kwargs):
-    """
-    Check whether there are any view restrictions on this page which are
-    not fulfilled by the given request object. If there are, return an
-    HttpResponse that will notify the user of that restriction (and possibly
-    include a password / login form that will allow them to proceed). If
-    there are no such restrictions, return None
-    """
-    for restriction in page.get_view_restrictions():
-        if not restriction.accept_request(request):
-            if restriction.restriction_type == PageViewRestriction.PASSWORD:
-                from wagtail.forms import PasswordViewRestrictionForm
-
-                form = PasswordViewRestrictionForm(
-                    instance=restriction,
-                    initial={"return_url": request.get_full_path()},
-                )
-                action_url = reverse(
-                    "wagtailcore_authenticate_with_password",
-                    args=[restriction.id, page.id],
-                )
-                return page.serve_password_required_response(request, form, action_url)
-
-            elif restriction.restriction_type in [
-                PageViewRestriction.LOGIN,
-                PageViewRestriction.GROUPS,
-            ]:
-                return require_wagtail_login(next=request.get_full_path())
+@hooks.register("on_serve_page")
+def check_view_restrictions(callback):
+    def inner(page, request, serve_args, serve_kwargs):
+        """
+        Check whether there are any view restrictions on this page which are
+        not fulfilled by the given request object. If there are, return an
+        HttpResponse that will notify the user of that restriction (and possibly
+        include a password / login form that will allow them to proceed). If
+        there are no such restrictions, return None
+        """
+        restrictions = page.get_view_restrictions()
+        response = None
+        for restriction in restrictions:
+            if not restriction.accept_request(request):
+                if restriction.restriction_type == PageViewRestriction.PASSWORD:
+                    from wagtail.forms import PasswordViewRestrictionForm
+
+                    form = PasswordViewRestrictionForm(
+                        instance=restriction,
+                        initial={"return_url": request.get_full_path()},
+                    )
+                    action_url = reverse(
+                        "wagtailcore_authenticate_with_password",
+                        args=[restriction.id, page.id],
+                    )
+
+                    response = page.serve_password_required_response(
+                        request, form, action_url
+                    )
+                    add_never_cache_headers(response)
+                    return response
+                elif restriction.restriction_type in [
+                    PageViewRestriction.LOGIN,
+                    PageViewRestriction.GROUPS,
+                ]:
+                    response = require_wagtail_login(next=request.get_full_path())
+                    add_never_cache_headers(response)
+                    return response
+
+        response = callback(page, request, serve_args, serve_kwargs)
+        if restrictions:
+            add_never_cache_headers(response)
+        return response
+
+    return inner
 
 
 @hooks.register("register_rich_text_features")
@@ -551,3 +574,18 @@ def register_workflow_log_actions(actions):
                 }
             except (KeyError, TypeError):
                 return _("Workflow cancelled")
+
+
+@hooks.register("before_serve_page", order=0)
+def check_request_method(page: Page, request: "HttpRequest", *args, **kwargs):
+    """
+    Before serving, check the request method is permitted by the page,
+    and use the page object's :meth:``wagtail.models.Page.handle_options_request``
+    method to generate a response if the OPTIONS HTTP verb is used.
+    """
+    check_response = page.check_request_method(request, *args, **kwargs)
+    if check_response is not None:
+        return check_response
+    if request.method == HTTPMethod.OPTIONS.value:
+        return page.handle_options_request(request, *args, **kwargs)
+    return None

{wagtail-6.3.2.dist-info → wagtail-6.4rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail
-Version: 6.3.2
+Version: 6.4rc1
 Summary: A Django content management system.
 Home-page: https://wagtail.org/
 Author: Wagtail core team + contributors
@@ -42,11 +42,11 @@ Requires-Dist: Pillow (<12.0.0,>=9.1.0)
 Requires-Dist: beautifulsoup4 (<4.13,>=4.8)
 Requires-Dist: Willow[heif] (<2,>=1.8.0)
 Requires-Dist: requests (<3.0,>=2.11.1)
-Requires-Dist: l18n (>=2018.5)
 Requires-Dist: openpyxl (<4.0,>=3.0.10)
 Requires-Dist: anyascii (>=0.1.5)
 Requires-Dist: telepath (<1,>=0.3.1)
 Requires-Dist: laces (<0.2,>=0.1)
+Requires-Dist: django-tasks (<0.7,>=0.6.1)
 Provides-Extra: docs
 Requires-Dist: pyenchant (<4,>=3.1.1) ; extra == 'docs'
 Requires-Dist: sphinxcontrib-spelling (<8,>=7) ; extra == 'docs'