From a06169722caa76215668a86ff1c69c1c1e12b50f Mon Sep 17 00:00:00 2001
From: Tidiane Dia <atdia97@gmail.com>
Date: Mon, 22 Nov 2021 15:55:11 +0100
Subject: [PATCH] Add check method to PublishPageRevisionAction

---
 wagtail/admin/views/pages/edit.py             |  2 +-
 wagtail/core/actions/publish_page_revision.py | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/wagtail/admin/views/pages/edit.py b/wagtail/admin/views/pages/edit.py
index 1abb1b826f..2edf11b450 100644
--- a/wagtail/admin/views/pages/edit.py
+++ b/wagtail/admin/views/pages/edit.py
@@ -495,7 +495,7 @@ class EditView(TemplateResponseMixin, ContextMixin, HookResponseMixin, View):
             changed=self.has_content_changes,
             previous_revision=(self.previous_revision if self.is_reverting else None)
         )
-        action.execute()
+        action.execute(skip_permission_checks=True)
 
         if self.has_content_changes and 'comments' in self.form.formsets:
             changes = self.get_commenting_changes()
diff --git a/wagtail/core/actions/publish_page_revision.py b/wagtail/core/actions/publish_page_revision.py
index b17e6b9a74..c3e3924ab1 100644
--- a/wagtail/core/actions/publish_page_revision.py
+++ b/wagtail/core/actions/publish_page_revision.py
@@ -1,6 +1,7 @@
 import logging
 
 from django.conf import settings
+from django.core.exceptions import PermissionDenied
 from django.utils import timezone
 
 from wagtail.core.log_actions import log
@@ -10,6 +11,14 @@ from wagtail.core.signals import page_published
 logger = logging.getLogger("wagtail.core")
 
 
+class PublishPagePermissionError(PermissionDenied):
+    """
+    Raised when the page publish cannot be performed due to insufficient permissions.
+    """
+
+    pass
+
+
 class PublishPageRevisionAction:
     """
     Publish or schedule revision for publishing.
@@ -27,33 +36,42 @@ class PublishPageRevisionAction:
 
     def __init__(self, revision, user=None, changed=True, log_action=True, previous_revision=None):
         self.revision = revision
+        self.page = self.revision.as_page_object()
         self.user = user
         self.changed = changed
         self.log_action = log_action
         self.previous_revision = previous_revision
 
-    def log_scheduling_action(self, page):
+    def check(self, skip_permission_checks=False):
+        if (
+            self.user
+            and not skip_permission_checks
+            and not self.page.permissions_for_user(self.user).can_publish()
+        ):
+            raise PublishPagePermissionError(
+                "You do not have permission to publish this page"
+            )
+
+    def log_scheduling_action(self):
         log(
-            instance=page,
+            instance=self.page,
             action="wagtail.publish.schedule",
             user=self.user,
             data={
                 "revision": {
                     "id": self.revision.id,
                     "created": self.revision.created_at.strftime("%d %b %Y %H:%M"),
-                    "go_live_at": page.go_live_at.strftime("%d %b %Y %H:%M"),
-                    "has_live_version": page.live,
+                    "go_live_at": self.page.go_live_at.strftime("%d %b %Y %H:%M"),
+                    "has_live_version": self.page.live,
                 }
             },
             revision=self.revision,
             content_changed=self.changed,
         )
 
-    def _publish_page_revision(self, revision, user, changed, log_action, previous_revision):
+    def _publish_page_revision(self, revision, page, user, changed, log_action, previous_revision):
         from wagtail.core.models import COMMENTS_RELATION_NAME, PageRevision
 
-        page = revision.as_page_object()
-
         if page.go_live_at and page.go_live_at > timezone.now():
             page.has_unpublished_changes = True
             # Instead set the approved_go_live_at of this revision
@@ -65,7 +83,7 @@ class PublishPageRevisionAction:
             if page.live_revision:
                 # Log scheduled publishing
                 if log_action:
-                    self.log_scheduling_action(page)
+                    self.log_scheduling_action()
 
                 return
             # if we have a go_live in the future don't make the page live
@@ -179,11 +197,14 @@ class PublishPageRevisionAction:
             )
 
             if log_action:
-                self.log_scheduling_action(page)
+                self.log_scheduling_action()
+
+    def execute(self, skip_permission_checks=False):
+        self.check(skip_permission_checks=skip_permission_checks)
 
-    def execute(self):
         return self._publish_page_revision(
             self.revision,
+            self.page,
             user=self.user,
             changed=self.changed,
             log_action=self.log_action,