Merge branch '2.4.3-develop' into 2.4.3-develop-2.4-develop-sync-032621

Author: dvoskoboinikov

app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php

@@ -108,8 +108,10 @@ public function execute()
 
             $result['url'] = $this->productMediaConfig->getTmpMediaUrl($result['file']);
             $result['file'] = $result['file'] . '.tmp';
-        } catch (\Exception $e) {
+        } catch (LocalizedException $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
+        } catch (\Throwable $e) {
+            $result = ['error' => 'Something went wrong while saving the file(s).', 'errorcode' => 0];
         }
 
         /** @var \Magento\Framework\Controller\Result\Raw $response */

app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml

@@ -5,7 +5,6 @@
   * See COPYING.txt for license details.
   */
 -->
-
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminAddProductsToOptionPanel">
@@ -16,4 +15,4 @@
         <element name="firstCheckbox" type="input" selector="//tr[1]//input[@data-action='select-row']"/>
         <element name="nthCheckbox" type="input" selector="//tr[{{var}}]//input[@data-action='select-row']" parameterized="true"/>
     </section>
-</sections>
+</sections>

app/code/Magento/ConfigurableProduct/Plugin/Model/Attribute/Backend/AttributeValidation.php

@@ -3,13 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Plugin\Model\Attribute\Backend;
 
+use Closure;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Framework\DataObject;
 
 /**
- * Skip validate attributes used for create configurable product
+ * Skip validate attributes used for create configurable product.
  */
 class AttributeValidation
 {
@@ -19,29 +23,36 @@ class AttributeValidation
     private $configurableProductType;
 
     /**
-     * AttributeValidation constructor.
+     * @var array
+     */
+    private $unskippableAttributes;
+
+    /**
      * @param Configurable $configurableProductType
+     * @param array|null $unskippableAttributes
      */
     public function __construct(
-        Configurable $configurableProductType
+        Configurable $configurableProductType,
+        array $unskippableAttributes = []
     ) {
         $this->configurableProductType = $configurableProductType;
+        $this->unskippableAttributes = $unskippableAttributes;
     }
 
     /**
-     * @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject
+     * Around plugin to skip attribute validation used for create configurable product.
+     *
+     * @param AbstractBackend $subject
      * @param \Closure $proceed
-     * @param \Magento\Framework\DataObject $entity
+     * @param DataObject $entity
      * @return bool
      */
-    public function aroundValidate(
-        \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject,
-        \Closure $proceed,
-        \Magento\Framework\DataObject $entity
-    ) {
+    public function aroundValidate(AbstractBackend $subject, Closure $proceed, DataObject $entity)
+    {
         $attribute = $subject->getAttribute();
         if ($entity instanceof ProductInterface
             && $entity->getTypeId() == Configurable::TYPE_CODE
+            && !in_array($attribute->getAttributeCode(), $this->unskippableAttributes)
             && in_array(
                 $attribute->getAttributeId(),
                 $this->configurableProductType->getUsedProductAttributeIds($entity),
@@ -50,6 +61,7 @@ public function aroundValidate(
         ) {
             return true;
         }
+
         return $proceed($entity);
     }
 }

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

@@ -33,6 +33,13 @@
     <type name="Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend">
         <plugin name="ConfigurableProduct::skipValidation" type="Magento\ConfigurableProduct\Plugin\Model\Attribute\Backend\AttributeValidation"/>
     </type>
+    <type name="Magento\ConfigurableProduct\Plugin\Model\Attribute\Backend\AttributeValidation">
+        <arguments>
+            <argument name="unskippableAttributes" xsi:type="array">
+                <item name="custom_layout_update" xsi:type="string">custom_layout_update</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface">
         <plugin name="configurable_product" type="Magento\ConfigurableProduct\Model\Entity\Product\Attribute\Group\AttributeMapper\Plugin" sortOrder="50" />
     </type>

app/code/Magento/Csp/Helper/InlineUtil.php

@@ -9,6 +9,7 @@
 namespace Magento\Csp\Helper;
 
 use Magento\Csp\Api\InlineUtilInterface;
+use Magento\Csp\Model\Collector\ConfigCollector;
 use Magento\Csp\Model\Collector\DynamicCollector;
 use Magento\Csp\Model\Policy\FetchPolicy;
 use Magento\Framework\App\ObjectManager;
@@ -39,6 +40,11 @@ class InlineUtil implements InlineUtilInterface, SecurityProcessorInterface
      */
     private $htmlRenderer;
 
+    /**
+     * @var ConfigCollector
+     */
+    private $configCollector;
+
     private static $tagMeta = [
         'script' => ['id' => 'script-src', 'remote' => ['src'], 'hash' => true],
         'style' => ['id' => 'style-src', 'remote' => [], 'hash' => true],
@@ -60,15 +66,18 @@ class InlineUtil implements InlineUtilInterface, SecurityProcessorInterface
      * @param DynamicCollector $dynamicCollector
      * @param bool $useUnsafeHashes Use 'unsafe-hashes' policy (not supported by CSP v2).
      * @param HtmlRenderer|null $htmlRenderer
+     * @param ConfigCollector|null $configCollector
      */
     public function __construct(
         DynamicCollector $dynamicCollector,
         bool $useUnsafeHashes = false,
-        ?HtmlRenderer $htmlRenderer = null
+        ?HtmlRenderer $htmlRenderer = null,
+        ?ConfigCollector $configCollector = null
     ) {
         $this->dynamicCollector = $dynamicCollector;
         $this->useUnsafeHashes = $useUnsafeHashes;
         $this->htmlRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(HtmlRenderer::class);
+        $this->configCollector = $configCollector ?? ObjectManager::getInstance()->get(ConfigCollector::class);
     }
 
     /**
@@ -187,7 +196,10 @@ public function processTag(TagData $tagData): TagData
                     new FetchPolicy($policyId, false, $remotes)
                 );
             }
-            if ($tagData->getContent() && !empty(self::$tagMeta[$tagData->getTag()]['hash'])) {
+            if ($tagData->getContent()
+                && !empty(self::$tagMeta[$tagData->getTag()]['hash'])
+                && $this->isInlineDisabled(self::$tagMeta[$tagData->getTag()]['id'])
+            ) {
                 $this->dynamicCollector->add(
                     new FetchPolicy(
                         $policyId,
@@ -233,4 +245,21 @@ public function processEventHandler(EventHandlerData $eventHandlerData): EventHa
 
         return $eventHandlerData;
     }
+
+    /**
+     * Check if inline sources are prohibited.
+     *
+     * @param string $policyId
+     * @return bool
+     */
+    private function isInlineDisabled(string $policyId): bool
+    {
+        foreach ($this->configCollector->collect() as $policy) {
+            if ($policy->getId() === $policyId && $policy instanceof FetchPolicy) {
+                return !$policy->isInlineAllowed();
+            }
+        }
+
+        return false;
+    }
 }