MC-30981: CSP rules not enabled on first login to admin

Author: Oleksandr Gorkun

app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Data.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\CspWhitelistXml;
+
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Config\Data\Scoped;
+use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Config\CacheInterface;
+
+/**
+ * Provides CSP whitelist configuration
+ */
+class Data extends Scoped
+{
+    /**
+     * Scope priority loading scheme
+     *
+     * @var array
+     */
+    protected $_scopePriorityScheme = ['global'];
+
+    /**
+     * Constructor
+     *
+     * @param Reader $reader
+     * @param ScopeInterface $configScope
+     * @param CacheInterface $cache
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(
+        Reader $reader,
+        ScopeInterface $configScope,
+        CacheInterface $cache,
+        SerializerInterface $serializer
+    ) {
+        parent::__construct($reader, $configScope, $cache, 'csp_whitelist_config', $serializer);
+    }
+}

app/code/Magento/Csp/Model/Collector/CspWhitelistXmlCollector.php

@@ -9,7 +9,7 @@
 namespace Magento\Csp\Model\Collector;
 
 use Magento\Csp\Api\PolicyCollectorInterface;
-use Magento\Csp\Model\Collector\CspWhitelistXml\Reader as ConfigReader;
+use Magento\Framework\Config\DataInterface as ConfigReader;
 use Magento\Csp\Model\Policy\FetchPolicy;
 
 /**
@@ -36,7 +36,7 @@ public function __construct(ConfigReader $configReader)
     public function collect(array $defaultPolicies = []): array
     {
         $policies = $defaultPolicies;
-        $config = $this->configReader->read();
+        $config = $this->configReader->get(null);
         foreach ($config as $policyId => $values) {
             $policies[] = new FetchPolicy(
                 $policyId,

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

@@ -49,6 +49,16 @@
             <argument name="fileName" xsi:type="string">csp_whitelist.xml</argument>
         </arguments>
     </type>
+    <type name="Magento\Csp\Model\Collector\CspWhitelistXml\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Reader\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Csp\Model\Collector\CspWhitelistXmlCollector">
+        <arguments>
+            <argument name="configReader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Data</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\View\TemplateEngine\Php">
         <plugin name="csp_helper_plugin" type="Magento\Csp\Plugin\TemplateRenderingPlugin" />
     </type>