Merge pull request #257 from magento-obsessive-owls/MC-15970

MC-15970 and sync 1.0-develop w/ 1.0.1-release branch

Author: cspruiell

app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php

@@ -49,17 +49,28 @@ public function filterHtml(string $content): string
             $this->loggerInterface->critical($e->getMessage());
         }
         libxml_use_internal_errors($previous);
-        // Remove all <script /> tags from output
-        foreach (iterator_to_array($dom->getElementsByTagName('script')) as $item) {
-            $item->parentNode->removeChild($item);
+        // Remove all <script /> tags, on* attributes from output
+        /** @var \DOMElement $item */
+        foreach (iterator_to_array($dom->getElementsByTagName('*')) as $item) {
+            if (in_array($item->tagName, ['script', 'meta', 'embed', 'object'])) {
+                $item->parentNode->removeChild($item);
+            } else {
+                foreach (iterator_to_array($item->attributes) as $attribute) {
+                    if (stripos($attribute->name, 'on') === 0 ||
+                        stripos(ltrim($attribute->value), 'javascript') === 0
+                    ) {
+                        $item->removeAttribute($attribute->name);
+                    }
+                }
+            }
         }
         $xpath = new \DOMXPath($dom);
         $htmlContentTypes = $xpath->query(
             '//*[@data-content-type="html" and not(contains(@class, "placeholder-html-code"))]'
         );
         foreach ($htmlContentTypes as $htmlContentType) {
             /* @var \DOMElement $htmlContentType */
-            $innerHTML= '';
+            $innerHTML = '';
             $children = $htmlContentType->childNodes;
             foreach ($children as $child) {
                 $innerHTML .= $child->ownerDocument->saveXML($child);

app/code/Magento/PageBuilder/Test/Mftf/Data/HtmlData.xml

@@ -22,6 +22,7 @@
         <data key="section">general</data>
         <data key="fieldName">html</data>
         <data key="value">&lt;a class=&quot;pagebuilder-button-primary&quot; onclick=&quot;location.href = 'https://google.com';&quot;&gt;&lt;span&gt;Test Button&lt;/span&gt;&lt;/a&gt;</data>
+        <data key="valueOnStage">&lt;a class=&quot;pagebuilder-button-primary&quot;&gt;&lt;span&gt;Test Button&lt;/span&gt;&lt;/a&gt;</data>
         <data key="selector">[contains(text(), 'a class="pagebuilder-button-primary"')]</data>
         <data key="selectorOnFrontend">//a[@class='pagebuilder-button-primary' and @onclick=&quot;location.href = 'https://google.com';&quot;]//span[.='Test Button']</data>
         <data key="url">https://www.google.com/</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest.xml

@@ -102,12 +102,12 @@
         </actionGroup>
         <see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockContentOnCmsStage"/>
     </test>
-    <test name="BlockGetUpdated">
+    <test name="BlockGetsUpdated">
         <annotations>
             <features value="PageBuilder"/>
             <stories value="Block"/>
-            <title value="Block Content Block get updated"/>
-            <description value="Verify that Block Content Block get updated from Block entities"/>
+            <title value="Block Content Block gets updated"/>
+            <description value="Verify that Block Content Type gets updated from Block entities"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-2289"/>
             <useCaseId value="MC-1420"/>
@@ -126,7 +126,7 @@
             <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCmsPage1">
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPageInAdmin">
             <argument name="CMSPage" value="$$createCMSPage$$"/>
         </actionGroup>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
@@ -154,8 +154,10 @@
         <actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToCMSPageStorefront">
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
-        <see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockContentOnCmsStage"/>
-        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCmsBlock">
+        <see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockContentOnStorefront"/>
+        <!-- Update block content in admin -->
+        <comment userInput="Update block content in admin" stepKey="commentUpdateBlockContentInAdmin"/>
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCmsBlockInAdmin">
             <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
         </actionGroup>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -166,14 +168,14 @@
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
         <actionGroup ref="saveCMSBlock" stepKey="saveCMSBlock"/>
-        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCmsPage2">
+        <!-- Validate Stage after updating block -->
+        <comment userInput="Validate stage after updating block" stepKey="validateStage2"/>
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPageInAdmin2">
             <argument name="CMSPage" value="$$createCMSPage$$"/>
         </actionGroup>
-        <!-- Validate Stage -->
-        <comment userInput="Validate stage after updating block" stepKey="validateStage2"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
         <waitForElementVisible selector="{{HtmlOnStage.base('1')}}" stepKey="waitForHtmlBaseStage1"/>
-        <see selector="{{BlockOnStage.html('1', '1')}}" userInput="{{PageBuilderHtmlPropertyButton.value}}" stepKey="waitForHtmlStage1"/>
+        <see selector="{{BlockOnStage.html('1', '1')}}" userInput="{{PageBuilderHtmlPropertyButton.valueOnStage}}" stepKey="waitForHtmlStage1"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="clearMagentoCache"/>
         <!-- Validate Storefront -->
         <comment userInput="Validate storefront after updating block" stepKey="validateStorefront2"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/nesting-link-dialog.js

@@ -28,7 +28,7 @@ export default function nestingLinkDialog(
     const dataStoreContent = dataStore.getState() as DataObject;
     const inlineMessage = dataStoreContent[inlineMessageField] as string;
     const linkUrl = dataStoreContent[linkUrlField] as FieldDefaultsInterface;
-    const aLinkRegex = /<a[\s]+([^>]+)>|<a>|<\/a>/igm;
+    const aLinkRegex = /(<a[\s]+[^>]+).+(?=<\/a>)<\/a>/igm;
     if (wysiwyg &&
         inlineMessage.match(aLinkRegex) &&
         linkUrl &&