Skip to content

Commit 0aab4aa

Browse files
authored
Merge branch '2.4-develop' into 31344-php8-update-phpcpd
2 parents 8ba14cb + 7dcc257 commit 0aab4aa

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<policy id="script-src">
1212
<values>
1313
<value id="adobedtm" type="host">assets.adobedtm.com</value>
14+
<value id="adobe" type="host">*.adobe.com</value>
15+
</values>
16+
</policy>
17+
<policy id="style-src">
18+
<values>
19+
<value id="adobe" type="host">*.adobe.com</value>
1420
</values>
1521
</policy>
1622
<policy id="img-src">
@@ -19,6 +25,7 @@
1925
<value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
2026
<value id="dpmdemdex" type="host">dpm.demdex.net</value>
2127
<value id="everesttech" type="host">cm.everesttech.net</value>
28+
<value id="adobe" type="host">*.adobe.com</value>
2229
</values>
2330
</policy>
2431
<policy id="connect-src">
@@ -27,9 +34,15 @@
2734
<value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
2835
</values>
2936
</policy>
37+
<policy id="media-src">
38+
<values>
39+
<value id="adobe" type="host">*.adobe.com</value>
40+
</values>
41+
</policy>
3042
<policy id="frame-src">
3143
<values>
3244
<value id="amcdemdex" type="host">fast.amc.demdex.net</value>
45+
<value id="adobe" type="host">*.adobe.com</value>
3346
</values>
3447
</policy>
3548
</policies>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ public function testCollecting(): void
6363
$objectSrcChecked = true;
6464
} elseif ($policy->getId() === 'media-src') {
6565
$this->assertInstanceOf(FetchPolicy::class, $policy);
66-
$this->assertEquals(['https://magento.com', 'https://devdocs.magento.com'], $policy->getHostSources());
66+
$this->assertEquals(
67+
['*.adobe.com', 'https://magento.com', 'https://devdocs.magento.com'],
68+
$policy->getHostSources()
69+
);
6770
$this->assertEmpty($policy->getHashes());
6871
$mediaSrcChecked = true;
6972
}
@@ -116,6 +119,7 @@ public function testCollectingForAdminhtmlArea(): void
116119
$this->assertInstanceOf(FetchPolicy::class, $policy);
117120
$this->assertEquals(
118121
[
122+
'*.adobe.com',
119123
'https://admin.magento.com',
120124
'https://devdocs.magento.com',
121125
'example.magento.com'

0 commit comments

Comments
 (0)