From 11a5e589aa2cece841a7f37f9e053d36fd510c07 Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Wed, 7 Oct 2020 13:06:56 +0300
Subject: [PATCH] v1.14.4: Updated CSP whitelist

---
 composer.json             |  2 +-
 etc/csp_whitelist.xml     | 44 +++++++++++++--------------------------
 etc/module.xml            |  2 +-
 marketplace.composer.json |  2 +-
 4 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/composer.json b/composer.json
index 139461bf..7637dcee 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.14.3",
+    "version": "1.14.4",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
index 775e7e98..d282ecb4 100644
--- a/etc/csp_whitelist.xml
+++ b/etc/csp_whitelist.xml
@@ -3,51 +3,35 @@
     <policies>
         <policy id="script-src">
             <values>
-                <value id="cloudinary_main" type="host">cloudinary.com</value>
-                <value id="cloudinary_main_www" type="host">www.cloudinary.com</value>
-                <value id="cloudinary_api" type="host">api.cloudinary.com</value>
-                <value id="cloudinary_media_library" type="host">media-library.cloudinary.com</value>
-                <value id="cloudinary_product_gallery" type="host">product-gallery.cloudinary.com</value>
-                <value id="cloudinary_analytics_api" type="host">analytics-api.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
                 <value id="cloudinary_cloudflare_cdnjs" type="host">cdnjs.cloudflare.com</value>
-                <value id="cloudinary_res" type="host">res.cloudinary.com</value>
             </values>
         </policy>
         <policy id="frame-src">
             <values>
-                <value id="cloudinary_main" type="host">cloudinary.com</value>
-                <value id="cloudinary_main_www" type="host">www.cloudinary.com</value>
-                <value id="cloudinary_api" type="host">p.cloudinary.com</value>
-                <value id="cloudinary_media_library" type="host">media-library.cloudinary.com</value>
-                <value id="cloudinary_product_gallery" type="host">product-gallery.cloudinary.com</value>
-                <value id="cloudinary_analytics_api" type="host">analytics-api.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
                 <value id="cloudinary_cloudflare_cdnjs" type="host">cdnjs.cloudflare.com</value>
-                <value id="cloudinary_res" type="host">res.cloudinary.com</value>
+            </values>
+        </policy>
+        <policy id="connect-src">
+            <values>
+                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+            </values>
+        </policy>
+        <policy id="form-action">
+            <values>
+                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
             </values>
         </policy>
         <policy id="img-src">
             <values>
-                <value id="cloudinary_main" type="host">cloudinary.com</value>
-                <value id="cloudinary_main_www" type="host">www.cloudinary.com</value>
-                <value id="cloudinary_media_library" type="host">media-library.cloudinary.com</value>
-                <value id="cloudinary_product_gallery" type="host">product-gallery.cloudinary.com</value>
-                <value id="cloudinary_res" type="host">res.cloudinary.com</value>
-                <value id="cloudinary_res_1" type="host">res-1.cloudinary.com</value>
-                <value id="cloudinary_res_2" type="host">res-2.cloudinary.com</value>
-                <value id="cloudinary_res_3" type="host">res-3.cloudinary.com</value>
-                <value id="cloudinary_res_4" type="host">res-4.cloudinary.com</value>
-                <value id="cloudinary_res_5" type="host">res-5.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
                 <value id="data" type="host">data:</value>
             </values>
         </policy>
         <policy id="style-src">
             <values>
-                <value id="cloudinary_main" type="host">cloudinary.com</value>
-                <value id="cloudinary_main_www" type="host">www.cloudinary.com</value>
-                <value id="cloudinary_api" type="host">p.cloudinary.com</value>
-                <value id="cloudinary_media_library" type="host">media-library.cloudinary.com</value>
-                <value id="cloudinary_product_gallery" type="host">product-gallery.cloudinary.com</value>
-                <value id="cloudinary_res" type="host">res.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
             </values>
         </policy>
     </policies>
diff --git a/etc/module.xml b/etc/module.xml
index 9f89ab9d..5056d8c6 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.14.3">
+  <module name="Cloudinary_Cloudinary" setup_version="1.14.4">
       <sequence>
           <module name="Magento_ProductVideo"/>
           <module name="Magento_PageBuilder"/>
diff --git a/marketplace.composer.json b/marketplace.composer.json
index 6653f644..14fe4763 100644
--- a/marketplace.composer.json
+++ b/marketplace.composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.14.3",
+    "version": "1.14.4",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"