From 466d10d6f045f3877623acbff3bb54dcf26faf69 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 1 Sep 2020 19:13:06 +0200
Subject: [PATCH 1/5] MC-37065: [Magento Admin] Fix CSP Issue - Avoid CSP
 errors related to Adobe Launch adding domains to csp_whitelist.xml

---
 .../Magento/AdminAnalytics/etc/csp_whitelist.xml  | 14 ++++++++++++++
 .../view/adminhtml/templates/test.phtml           | 15 +++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
index e937a3e18148a..bcd1d96713a96 100644
--- a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -13,5 +13,19 @@
                     <value id="adobedtm" type="host">assets.adobedtm.com</value>
                 </values>
             </policy>
+            <policy id="img-src">
+                <values>
+                    <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                    <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                    <value id="data" type="host">data:</value>
+                </values>
+            </policy>
+            <policy id="connect-src">
+                <value id="dpmdemdex" type="host">dpm.demdex.net</value>
+                <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+            </policy>
+            <policy id="frame-src">
+                <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+            </policy>
         </policies>
 </csp_whitelist>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml
new file mode 100644
index 0000000000000..0c2324567aaae
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+?>
+
+<script>
+    if (!window.digitalData) {
+        window.digitalData = {};
+    }
+
+    digitalData.nonce = '123-abc-def-456';
+</script>

From 7fa8c096a0dc4cacc9236e551be653564c513f42 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 1 Sep 2020 19:20:30 +0200
Subject: [PATCH 2/5] MC-37065: [Magento Admin] Fix CSP Issue - Delete
 unnecessary file

---
 .../view/adminhtml/templates/test.phtml           | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml
deleted file mode 100644
index 0c2324567aaae..0000000000000
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-?>
-
-<script>
-    if (!window.digitalData) {
-        window.digitalData = {};
-    }
-
-    digitalData.nonce = '123-abc-def-456';
-</script>

From 6976e7d2729211cd8b7c558f71f2957465c07897 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 2 Sep 2020 10:09:42 +0200
Subject: [PATCH 3/5] MC-37065: [Magento Admin] Fix CSP Issue - Add more
 domains to img-src policy

---
 app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
index bcd1d96713a96..95d7f7f203d78 100644
--- a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -17,6 +17,8 @@
                 <values>
                     <value id="adobedtm" type="host">assets.adobedtm.com</value>
                     <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="data" type="host">data:</value>
                 </values>
             </policy>

From c1d7415ba7e865c446e156e5ed1ad8d0b441652c Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 2 Sep 2020 10:51:52 +0200
Subject: [PATCH 4/5] MC-37065: [Magento Admin] Fix CSP Issue - Add missing
 <values> tag on xml file

---
 app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
index 95d7f7f203d78..27b4c84304a40 100644
--- a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -23,11 +23,15 @@
                 </values>
             </policy>
             <policy id="connect-src">
-                <value id="dpmdemdex" type="host">dpm.demdex.net</value>
-                <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                <values>
+                    <value id="dpmdemdex" type="host">dpm.demdex.net</value>
+                    <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                </values>
             </policy>
             <policy id="frame-src">
-                <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                <values>
+                    <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                </values>
             </policy>
         </policies>
 </csp_whitelist>

From d81eba1442f471596d3354271d6b2926ebae3846 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 2 Sep 2020 18:04:38 +0200
Subject: [PATCH 5/5] MC-37065: [Magento Admin] Fix CSP Issue - Refactor: Move
 ':data' value inside Csp module

---
 .../AdminAnalytics/etc/csp_whitelist.xml        |  1 -
 app/code/Magento/Csp/etc/csp_whitelist.xml      | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Csp/etc/csp_whitelist.xml

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
index 27b4c84304a40..f16a66aa090e3 100644
--- a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -19,7 +19,6 @@
                     <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="data" type="host">data:</value>
                 </values>
             </policy>
             <policy id="connect-src">
diff --git a/app/code/Magento/Csp/etc/csp_whitelist.xml b/app/code/Magento/Csp/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..b0cce028ac8b6
--- /dev/null
+++ b/app/code/Magento/Csp/etc/csp_whitelist.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+        <policies>
+            <policy id="img-src">
+                <values>
+                    <value id="data" type="host">data:</value>
+                </values>
+            </policy>
+        </policies>
+</csp_whitelist>