Merge branch 'MC-41379' into cia-2.4.3-bugfixes-4272021

Author: admanesachin

app/code/Magento/Widget/Model/Widget/Instance.php

@@ -662,6 +662,7 @@ public function generateLayoutUpdateXml($container, $templatePath = '')
             } elseif (is_array($value)) {
                 $value = implode(',', $value);
             }
+            $this->validateWidgetParameters($name);
             if ($name && strlen((string)$value)) {
                 // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 $value = html_entity_decode($value);
@@ -702,6 +703,23 @@ private function validateLayoutUpdateXml(string $xml): void
         }
     }
 
+    /**
+     * Check if widget parameter doesn't contains payload
+     *
+     * @param $param
+     * @throws LocalizedException
+     */
+    private function validateWidgetParameters(string $param): void
+    {
+        try {
+            if (!preg_match('/^\w+$/', $param)) {
+                throw new LocalizedException(__('Layout update is invalid'));
+            }
+        } catch (ValidationException|ValidationSchemaException $e) {
+            throw new LocalizedException(__('Layout update is invalid'));
+        }
+    }
+
     /**
      * Invalidate related cache types
      *

dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php

@@ -173,4 +173,22 @@ public function beforeSaveDataProvider()
             ]
         ];
     }
+
+    /**
+     * @param Instance $model
+     * @depends testGetWidgetConfigAsArray
+     */
+    public function testGenerateLayoutUpdateXmlWithInvalidParamName(\Magento\Widget\Model\Widget\Instance $model)
+    {
+        $params = [
+            'block_id' => '2',
+            'block_id</argument><argument name="value" xsi:type="string">2</argument></action></block><block'
+            . ' class="Magento\Cms\Block\Widget\Block" name="dfgdfgdfg" template="widget/static_block/default.phtml">'
+            . '<action method="setData"><argument name="name" xsi:type="string">' => 'some_value',
+        ];
+        $this->expectException('\Magento\Framework\Exception\LocalizedException');
+        $this->expectExceptionMessage('Layout update is invalid');
+        $model->setData('widget_parameters', $params);
+        $model->generateLayoutUpdateXml('content');
+    }
 }