Merge pull request #76 from cloudinary/v1.14.4

v1.14.4: Updated CSP whitelist
cloudinary · Oct 7, 2020 · abb3aae · abb3aae
2 parents 682ccb6 + 11a5e58
commit abb3aae
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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": "*"