Call beforeAction() up front

craftcms · Jun 27, 2023 · c0a37e1 · GHOST80872 · Sep 13, 2023 · c0a37e1
1 parent 72877eb
commit c0a37e1
Show file tree

Hide file tree

Showing 20 changed files with 105 additions and 22 deletions.
diff --git a/src/controllers/AssetIndexesController.php b/src/controllers/AssetIndexesController.php
@@ -36,11 +36,15 @@ class AssetIndexesController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // No permission no bueno
         $this->requirePermission('utility:asset-indexes');
         $this->requireAcceptsJson();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/AssetSettingsController.php b/src/controllers/AssetSettingsController.php
@@ -25,10 +25,14 @@ class AssetSettingsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All user settings actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/BaseElementsController.php b/src/controllers/BaseElementsController.php
@@ -27,10 +27,14 @@ abstract class BaseElementsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All actions require control panel requests
         $this->requireCpRequest();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/ConditionsController.php b/src/controllers/ConditionsController.php
@@ -34,6 +34,12 @@ class ConditionsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
+        $this->requireCpRequest();
+
         $baseConfig = Json::decodeIfJson($this->request->getBodyParam('config'));
         $config = $this->request->getBodyParam($baseConfig['name']);
         $newRuleType = ArrayHelper::remove($config, 'new-rule-type');
@@ -48,7 +54,7 @@ public function beforeAction($action): bool
             $this->_condition->addConditionRule($rule);
         }
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/FieldsController.php b/src/controllers/FieldsController.php
@@ -38,10 +38,14 @@ class FieldsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All field actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     // Groups

diff --git a/src/controllers/FsController.php b/src/controllers/FsController.php
@@ -33,10 +33,14 @@ class FsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All asset volume actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/GraphqlController.php b/src/controllers/GraphqlController.php
@@ -59,13 +59,17 @@ public function beforeAction($action): bool
             throw new NotFoundHttpException(Craft::t('yii', 'Page not found.'));
         }
 
-        Craft::$app->requireEdition(Craft::Pro);
-
         if ($action->id === 'api') {
             $this->enableCsrfValidation = false;
         }
 
-        return parent::beforeAction($action);
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
+        Craft::$app->requireEdition(Craft::Pro);
+
+        return true;
     }
 
     /**

diff --git a/src/controllers/ImageTransformsController.php b/src/controllers/ImageTransformsController.php
@@ -31,10 +31,14 @@ class ImageTransformsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All image transform actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/LivePreviewController.php b/src/controllers/LivePreviewController.php
@@ -36,12 +36,16 @@ class LivePreviewController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // Mark this as a Live Preview request
         if ($action->id === 'preview') {
             $this->request->setIsLivePreview(true);
         }
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/PluginStoreController.php b/src/controllers/PluginStoreController.php
@@ -35,10 +35,14 @@ class PluginStoreController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All plugin store actions require an admin
         $this->requireAdmin(false);
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/PluginsController.php b/src/controllers/PluginsController.php
@@ -28,10 +28,14 @@ class PluginsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All plugin actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/RebrandController.php b/src/controllers/RebrandController.php
@@ -35,8 +35,13 @@ class RebrandController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         Craft::$app->requireEdition(Craft::Pro);
-        return parent::beforeAction($action);
+
+        return true;
     }
 
     /**

diff --git a/src/controllers/RoutesController.php b/src/controllers/RoutesController.php
@@ -26,10 +26,14 @@ class RoutesController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All route actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/SectionsController.php b/src/controllers/SectionsController.php
@@ -36,10 +36,14 @@ class SectionsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All section actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/SitesController.php b/src/controllers/SitesController.php
@@ -36,10 +36,14 @@ class SitesController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All actions require an admin account
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/StructuresController.php b/src/controllers/StructuresController.php
@@ -41,6 +41,10 @@ class StructuresController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         $this->requirePostRequest();
         $this->requireAcceptsJson();
 
@@ -80,7 +84,7 @@ public function beforeAction($action): bool
             throw new NotFoundHttpException('Element not found');
         }
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/SystemMessagesController.php b/src/controllers/SystemMessagesController.php
@@ -27,12 +27,16 @@ class SystemMessagesController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         Craft::$app->requireEdition(Craft::Pro);
 
         // Make sure they have access to the System Messages utility
         $this->requirePermission('utility:system-messages');
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/SystemSettingsController.php b/src/controllers/SystemSettingsController.php
@@ -40,10 +40,14 @@ class SystemSettingsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All system setting actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/UserSettingsController.php b/src/controllers/UserSettingsController.php
@@ -28,14 +28,18 @@ class UserSettingsController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All user settings actions require an admin
         $this->requireAdmin();
 
         if ($action->id !== 'save-user-settings') {
             Craft::$app->requireEdition(Craft::Pro);
         }
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**

diff --git a/src/controllers/VolumesController.php b/src/controllers/VolumesController.php
@@ -35,10 +35,14 @@ class VolumesController extends Controller
      */
     public function beforeAction($action): bool
     {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
         // All asset volume actions require an admin
         $this->requireAdmin();
 
-        return parent::beforeAction($action);
+        return true;
     }
 
     /**