Merge pull request #6797 from magento-trigger/MC-40624

MC-40624: Add Adobe DAM (Digital Asset Manager) to Admin Panel CSP

Author: fascinosum

app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml

@@ -11,6 +11,12 @@
             <policy id="script-src">
                 <values>
                     <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
+                </values>
+            </policy>
+            <policy id="style-src">
+                <values>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
             <policy id="img-src">
@@ -19,6 +25,7 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                     <value id="dpmdemdex" type="host">dpm.demdex.net</value>
                     <value id="everesttech" type="host">cm.everesttech.net</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
             <policy id="connect-src">
@@ -27,9 +34,15 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                 </values>
             </policy>
+            <policy id="media-src">
+                <values>
+                    <value id="adobe" type="host">*.adobe.com</value>
+                </values>
+            </policy>
             <policy id="frame-src">
                 <values>
                     <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
         </policies>

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

@@ -63,7 +63,10 @@ public function testCollecting(): void
                 $objectSrcChecked = true;
             } elseif ($policy->getId() === 'media-src') {
                 $this->assertInstanceOf(FetchPolicy::class, $policy);
-                $this->assertEquals(['https://magento.com', 'https://devdocs.magento.com'], $policy->getHostSources());
+                $this->assertEquals(
+                    ['*.adobe.com', 'https://magento.com', 'https://devdocs.magento.com'],
+                    $policy->getHostSources()
+                );
                 $this->assertEmpty($policy->getHashes());
                 $mediaSrcChecked = true;
             }
@@ -116,6 +119,7 @@ public function testCollectingForAdminhtmlArea(): void
                 $this->assertInstanceOf(FetchPolicy::class, $policy);
                 $this->assertEquals(
                     [
+                        '*.adobe.com',
                         'https://admin.magento.com',
                         'https://devdocs.magento.com',
                         'example.magento.com'