AC-10686: [PCI] SRI enabled on payment pages

Author: dvoskoboinikov

app/code/Magento/Csp/Block/Sri/Hashes.php

@@ -8,6 +8,7 @@
 namespace Magento\Csp\Block\Sri;
 
 use Magento\Framework\UrlInterface;
+use Magento\Deploy\Package\Package;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\Exception\LocalizedException;
@@ -64,12 +65,22 @@ public function getSerialized(): string
     {
         $result = [];
 
+        $baseUrl = $this->_urlBuilder->getBaseUrl(
+            ["_type" => UrlInterface::URL_TYPE_STATIC]
+        );
+
         $integrityRepository = $this->integrityRepositoryPool->get(
-            $this->_appState->getAreaCode()
+            Package::BASE_AREA
         );
 
-        $baseUrl = $this->_urlBuilder->getBaseUrl(
-            ["_type" => UrlInterface::URL_TYPE_STATIC]
+        foreach ($integrityRepository->getAll() as $integrity) {
+            $url = $baseUrl . $integrity->getPath();
+
+            $result[$url] = $integrity->getHash();
+        }
+
+        $integrityRepository = $this->integrityRepositoryPool->get(
+            $this->_appState->getAreaCode()
         );
 
         foreach ($integrityRepository->getAll() as $integrity) {

app/code/Magento/Csp/Plugin/AddDefaultPropertiesToGroupPlugin.php

@@ -8,6 +8,7 @@
 namespace Magento\Csp\Plugin;
 
 use Magento\Framework\App\State;
+use Magento\Deploy\Package\Package;
 use Magento\Framework\View\Asset\AssetInterface;
 use Magento\Framework\View\Asset\LocalInterface;
 use Magento\Framework\View\Asset\GroupedCollection;
@@ -56,11 +57,19 @@ public function beforeGetFilteredProperties(
     ): array {
         if ($asset instanceof LocalInterface) {
             $integrityRepository = $this->integrityRepositoryPool->get(
-                $this->state->getAreaCode()
+                Package::BASE_AREA
             );
 
             $integrity = $integrityRepository->getByPath($asset->getPath());
 
+            if (!$integrity) {
+                $integrityRepository = $this->integrityRepositoryPool->get(
+                    $this->state->getAreaCode()
+                );
+
+                $integrity = $integrityRepository->getByPath($asset->getPath());
+            }
+
             if ($integrity && $integrity->getHash()) {
                 $properties['attributes']['integrity'] = $integrity->getHash();
                 $properties['attributes']['crossorigin'] = 'anonymous';

app/code/Magento/Csp/Plugin/RemoveAllAssetIntegrityHashes.php

@@ -8,6 +8,7 @@
 namespace Magento\Csp\Plugin;
 
 use Magento\Framework\App\Area;
+use Magento\Deploy\Package\Package;
 use Magento\Deploy\Console\DeployStaticOptions;
 use Magento\Deploy\Service\DeployStaticContent;
 use Magento\Csp\Model\SubresourceIntegrityRepositoryPool;
@@ -46,7 +47,7 @@ public function beforeDeploy(
         array $options
     ): void {
         if (PHP_SAPI == 'cli' && !$this->isRefreshContentVersionOnly($options)) {
-            foreach ([Area::AREA_FRONTEND, Area::AREA_ADMINHTML] as $area) {
+            foreach ([Package::BASE_AREA, Area::AREA_FRONTEND, Area::AREA_ADMINHTML] as $area) {
                 $this->integrityRepositoryPool->get($area)
                     ->deleteAll();
             }