Merge branch 'ACP2E-3326' of https://github.com/adobe-commerce-tier-4/magento2-page-builder into PR-10-01-2024

Author: chittima

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

@@ -78,17 +78,43 @@ public function filterHtml(string $content): string
         );
         foreach ($htmlContentTypes as $htmlContentType) {
             /* @var \DOMElement $htmlContentType */
-            $innerHTML = '';
-            $children = $htmlContentType->childNodes;
-            foreach ($children as $child) {
-                $innerHTML .= $child->ownerDocument->saveXML($child);
-            }
             $htmlContentType->setAttribute(
                 "class",
                 $htmlContentType->getAttribute("class") . " placeholder-html-code"
             );
+
+            $innerHTML = $this->getChildrenInnerHtml($htmlContentType);
+
             $htmlContentType->nodeValue = htmlentities($innerHTML);
         }
         return substr(trim($dom->saveHTML()), 5, -6);
     }
+
+    /**
+     * Get inner HTML of element's children
+     *
+     * @param \DOMElement $element
+     * @return string
+     */
+    private function getChildrenInnerHtml(\DOMElement $element): string
+    {
+        $innerHTML = '';
+        $childrenIterator = $element->childNodes->getIterator();
+        while ($childrenIterator->valid()) {
+            $child = $childrenIterator->current();
+            try {
+                $ownerDocument = $child->ownerDocument;
+            } catch (\Error $error) {
+                $ownerDocument = null;
+                $this->loggerInterface->critical($error->getMessage());
+            }
+            if ($ownerDocument === null) {
+                $childrenIterator->next();
+                continue;
+            }
+            $innerHTML .= $ownerDocument->saveXML($child);
+            $childrenIterator->next();
+        }
+        return $innerHTML;
+    }
 }

app/code/Magento/PageBuilder/Test/Unit/Model/Stage/HtmlFilterTest.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Model\Stage;
+
+use Magento\PageBuilder\Model\Stage\HtmlFilter;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class HtmlFilterTest extends TestCase
+{
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var HtmlFilter
+     */
+    private $htmlFilter;
+
+    protected function setUp(): void
+    {
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->htmlFilter = new HtmlFilter($this->loggerMock);
+    }
+
+    public function testFilterHtml()
+    {
+        //test for script tag
+        $inputHtml = '<div><script type="text/x-magento-init">alert("test")</script><p>Content</p></div>';
+        $expectedOutput = '<div><p>Content</p></div>';
+
+        $result = $this->htmlFilter->filterHtml($inputHtml);
+        $this->assertEquals($expectedOutput, $result);
+
+        //test for PB placeholder
+        $inputHtml = '
+<div data-content-type="html" data-appearance="default" data-element="main" class="test">
+<div class="block-123">Test</div>
+</div>';
+        $expectedOutput = '
+<div data-content-type="html" data-appearance="default" data-element="main" class="test placeholder-html-code">
+&lt;div class="block-123"&gt;Test&lt;/div&gt;
+</div>';
+
+        $result = $this->htmlFilter->filterHtml($inputHtml);
+        $this->assertEquals($expectedOutput, $result);
+    }
+}