MC-41018: Minor changes in CMS page validation

Author: OlgaVasyltsun

app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Config\Dom\ValidationException;
 use Magento\Framework\Config\Dom\ValidationSchemaException;
+use Magento\Cms\Model\Page\CustomLayout\CustomLayoutValidator;
 
 /**
  * Controller helper for user input.
@@ -36,23 +37,32 @@ class PostDataProcessor
      */
     private $validationState;
 
+    /**
+     * @var CustomLayoutValidator
+     */
+    private $customLayoutValidator;
+
     /**
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\View\Model\Layout\Update\ValidatorFactory $validatorFactory
-     * @param DomValidationState $validationState
+     * @param DomValidationState|null $validationState
+     * @param CustomLayoutValidator|null $customLayoutValidator
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Framework\View\Model\Layout\Update\ValidatorFactory $validatorFactory,
-        DomValidationState $validationState = null
+        DomValidationState $validationState = null,
+        CustomLayoutValidator $customLayoutValidator = null
     ) {
         $this->dateFilter = $dateFilter;
         $this->messageManager = $messageManager;
         $this->validatorFactory = $validatorFactory;
         $this->validationState = $validationState
             ?: ObjectManager::getInstance()->get(DomValidationState::class);
+        $this->customLayoutValidator = $customLayoutValidator
+            ?: ObjectManager::getInstance()->get(CustomLayoutValidator::class);
     }
 
     /**
@@ -146,6 +156,9 @@ private function validateData($data, $layoutXmlValidator)
             ) {
                 return false;
             }
+            if (!$this->customLayoutValidator->validate($data)) {
+                return false;
+            }
         } catch (ValidationException $e) {
             return false;
         } catch (ValidationSchemaException $e) {

app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutValidator.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page\CustomLayout;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Cms\Model\PageFactory;
+
+class CustomLayoutValidator
+{
+    /**
+     * @var PageFactory
+     */
+    protected $pageFactory;
+
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     * CustomLayoutValidator constructor.
+     * @param PageFactory $pageFactory
+     * @param ManagerInterface $messageManager
+     */
+    public function __construct(
+        PageFactory $pageFactory,
+        ManagerInterface $messageManager
+    ) {
+        $this->pageFactory = $pageFactory;
+        $this->messageManager = $messageManager;
+    }
+
+    /**
+     * Validates layout update and custom layout update for CMS page
+     *
+     * @param array $data
+     * @return bool
+     * @throws LocalizedException
+     */
+    public function validate(array $data)
+    {
+        $layoutUpdate = isset($data['layout_update_xml']) ? $data['layout_update_xml'] : null;
+        $customLayoutUpdate = isset($data['custom_layout_update_xml']) ? $data['custom_layout_update_xml'] : null;
+        $page = $this->pageFactory->create();
+        $page->load($data['page_id']);
+        $oldLayoutUpdate = $page->getId() ? $page->getLayoutUpdateXml() : null;
+        $olCustomLayoutUpdate = $page->getId() ? $page->getCustomLayoutUpdateXml() : null;
+        if ($layoutUpdate && $oldLayoutUpdate !== $layoutUpdate
+            || $customLayoutUpdate && $olCustomLayoutUpdate !== $customLayoutUpdate
+        ) {
+            throw new LocalizedException(__('Custom layout update text cannot be changed, only removed'));
+        }
+        return true;
+    }
+}

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php

@@ -20,6 +20,7 @@
 use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
 use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
 use Magento\UrlRewrite\Model\UrlRewrite;
+use Magento\Cms\Controller\Adminhtml\Page\PostDataProcessor;
 
 /**
  * Test the saving CMS pages design via admin area interface.
@@ -64,6 +65,8 @@ class PageDesignTest extends AbstractBackendController
      */
     private $pagesToDelete = [];
 
+    private $postDaraProcessor;
+
     /**
      * @inheritDoc
      */
@@ -81,6 +84,7 @@ protected function setUp(): void
         $this->pageRetriever = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
         $this->scopeConfig = Bootstrap::getObjectManager()->get(ScopeConfigInterface::class);
         $this->pagesToDelete = [];
+        $this->postDaraProcessor = Bootstrap::getObjectManager()->get(PostDataProcessor::class);
     }
 
     /**
@@ -295,4 +299,22 @@ public function testSaveWithInlavidIdentifier(): void
             MessageInterface::TYPE_ERROR
         );
     }
+
+    /**
+     * Test create CMS page with invalid layout update
+     *
+     * @return void
+     */
+    public function testSaveWithCustomLayoutUpdate(): void
+    {
+        $requestData = [
+            PageInterface::IDENTIFIER => 'randomidentified',
+            PageInterface::TITLE => 'page title',
+            PageInterface::CUSTOM_THEME => '1',
+            PageInterface::PAGE_LAYOUT => 'empty',
+            PageInterface::CUSTOM_LAYOUT_UPDATE_XML => '<container />',
+            PageInterface::LAYOUT_UPDATE_XML => '<container />',
+        ];
+        $this->assertFalse($this->postDaraProcessor->validate($requestData));
+    }
 }