MC-19926: Implement CSP

Author: Oleksandr Gorkun

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

@@ -12,8 +12,8 @@
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\State;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\Store;
 
 /**
  * Reads Magento config.
@@ -36,26 +36,26 @@ class ConfigCollector implements PolicyCollectorInterface
     private $state;
 
     /**
-     * @var Store
+     * @var StoreManagerInterface
      */
-    private $storeModel;
+    private $storeManager;
 
     /**
      * @param ScopeConfigInterface $config
      * @param PolicyReaderPool $readersPool
      * @param State $state
-     * @param Store $storeModel
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ScopeConfigInterface $config,
         PolicyReaderPool $readersPool,
         State $state,
-        Store $storeModel
+        StoreManagerInterface $storeManager
     ) {
         $this->config = $config;
         $this->readersPool = $readersPool;
         $this->state = $state;
-        $this->storeModel = $storeModel;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -77,7 +77,7 @@ public function collect(array $defaultPolicies = []): array
             $policiesConfig = $this->config->getValue(
                 'csp/policies/' . $configArea,
                 ScopeInterface::SCOPE_STORE,
-                $this->storeModel->getStore()
+                $this->storeManager->getStore()
             );
             if (is_array($policiesConfig) && $policiesConfig) {
                 foreach ($policiesConfig as $policyConfig) {

app/code/Magento/Csp/etc/csp_whitelist.xsd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Structure description for webapi.xml configuration files.
+ * Structure description for csp_whitelist.xml configuration files.
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.

dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php

@@ -160,11 +160,17 @@ private function getExpectedPolicies(): array
      */
     public function testCollecting(): void
     {
-        $policies = $this->collector->collect([]);
+        $policies = $this->collector->collect([new FlagPolicy('upgrade-insecure-requests')]);
         $checked = [];
         $expectedPolicies = $this->getExpectedPolicies();
 
+        //Policies were collected
         $this->assertNotEmpty($policies);
+        //Default policies are being kept
+        /** @var PolicyInterface $defaultPolicy */
+        $defaultPolicy = array_shift($policies);
+        $this->assertEquals('upgrade-insecure-requests', $defaultPolicy->getId());
+        //Comparing collected with configured
         /** @var PolicyInterface $policy */
         foreach ($policies as $policy) {
             $id = $policy->getId();