MC-34385: Filter fields allowing HTML

Author: ogorkun

app/code/Magento/Cms/Model/PageRepository.php

@@ -17,6 +17,7 @@
 use Magento\Framework\EntityManager\HydratorInterface;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Store\Model\StoreManagerInterface;
@@ -162,24 +163,28 @@ private function validateLayoutUpdate(Data\PageInterface $page): void
      */
     public function save(\Magento\Cms\Api\Data\PageInterface $page)
     {
-        if ($page->getStoreId() === null) {
-            $storeId = $this->storeManager->getStore()->getId();
-            $page->setStoreId($storeId);
-        }
-        $pageId = $page->getId();
-        if ($pageId && !($page instanceof Page && $page->getOrigData())) {
-            $page = $this->hydrator->hydrate($this->getById($pageId), $this->hydrator->extract($page));
-        }
-
         try {
+            $pageId = $page->getId();
+            if ($pageId && !($page instanceof Page && $page->getOrigData())) {
+                $page = $this->hydrator->hydrate($this->getById($pageId), $this->hydrator->extract($page));
+            }
+            if ($page->getStoreId() === null) {
+                $storeId = $this->storeManager->getStore()->getId();
+                $page->setStoreId($storeId);
+            }
             $this->validateLayoutUpdate($page);
             $this->resource->save($page);
             $this->identityMap->add($page);
-        } catch (\Exception $exception) {
+        } catch (LocalizedException $exception) {
             throw new CouldNotSaveException(
                 __('Could not save the page: %1', $exception->getMessage()),
                 $exception
             );
+        } catch (\Throwable $exception) {
+            throw new CouldNotSaveException(
+                __('Could not save the page: %1', __('Something went wrong while saving the page.')),
+                $exception
+            );
         }
         return $page;
     }

app/code/Magento/Cms/etc/di.xml

@@ -285,6 +285,8 @@
                 <item name="hr" xsi:type="string">hr</item>
                 <item name="figure" xsi:type="string">figure</item>
                 <item name="button" xsi:type="string">button</item>
+                <item name="i" xsi:type="string">i</item>
+                <item name="u" xsi:type="string">u</item>
             </argument>
             <argument name="allowedAttributes" xsi:type="array">
                 <item name="class" xsi:type="string">class</item>