Merge pull request #39 from cloudinary/v2.9.3

V2.9.3
cloudinary · Dec 27, 2018 · 2deae18 · 2deae18
2 parents 8cce8ba + d1a15a6
commit 2deae18
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 15 deletions.
diff --git a/app/code/community/Cloudinary/Cloudinary/Model/Configuration.php b/app/code/community/Cloudinary/Cloudinary/Model/Configuration.php
@@ -204,7 +204,11 @@ private function setStoreConfig($configPath, $value)
     private function getEnvironmentVariable()
     {
         if (is_null($this->environmentVariable)) {
-            $value = Mage::helper('core')->decrypt(Mage::getStoreConfig(self::CONFIG_PATH_ENVIRONMENT_VARIABLE));
+            if (Mage::registry('cloudinaryEnvironmentVariable')) {
+                $value = Mage::helper('core')->decrypt(Mage::registry('cloudinaryEnvironmentVariable'));
+            } else {
+                $value = Mage::helper('core')->decrypt(Mage::getStoreConfig(self::CONFIG_PATH_ENVIRONMENT_VARIABLE));
+            }
             $this->environmentVariable = CloudinaryEnvironmentVariable::fromString($value);
         }
         return $this->environmentVariable;

diff --git a/app/code/community/Cloudinary/Cloudinary/Model/Observer/Config.php b/app/code/community/Cloudinary/Cloudinary/Model/Observer/Config.php
@@ -28,8 +28,11 @@ public function configSave(Varien_Event_Observer $observer)
 
         $data = Mage::helper('cloudinary_cloudinary/config')->flatten('cloudinary', $config->getGroups());
         if ($data[self::ENABLED_FIELD] == '1') {
+            Mage::register('cloudinaryIsEnabled', true);
             $this->validateEnvironmentVariable($data);
             $this->logConfigChange($data);
+        } else {
+            Mage::register('cloudinaryIsEnabled', false);
         }
     }
 
@@ -42,7 +45,7 @@ public function cloudinaryConfigChanged(Varien_Event_Observer $observer)
         Mage::app()->getCacheInstance()->cleanType("config");
         Mage::dispatchEvent('adminhtml_cache_refresh_type', array('type' => "config"));
 
-        if (!Mage::getModel('cloudinary_cloudinary/configuration')->isEnabled()) {
+        if (!Mage::registry('cloudinaryIsEnabled')) {
             return;
         }
 
@@ -62,12 +65,18 @@ public function cloudinaryConfigChanged(Varien_Event_Observer $observer)
      */
     private function validateEnvironmentVariable(array $data)
     {
+        $value = (string) $data[self::ENVIRONMENT_FIELD];
+        if (preg_match('/^\*+$/', $value)) {
+            $value = Mage::helper('core')->decrypt($value);
+        }
         $credentialValidator = new CredentialValidator();
-        $environmentVariable = CloudinaryEnvironmentVariable::fromString($data[self::ENVIRONMENT_FIELD]);
+        $environmentVariable = CloudinaryEnvironmentVariable::fromString($value);
 
         if (!$credentialValidator->validate($environmentVariable->getCredentials())) {
+            Mage::register('cloudinaryEnvironmentVariableIsValid', false);
             throw new Mage_Core_Exception(self::ERROR_WRONG_CREDENTIALS);
         }
+        Mage::register('cloudinaryEnvironmentVariableIsValid', true);
     }
 
     /**

diff --git a/app/code/community/Cloudinary/Cloudinary/Model/System/Config/Credentials.php b/app/code/community/Cloudinary/Cloudinary/Model/System/Config/Credentials.php
@@ -0,0 +1,41 @@
+<?php
+use CloudinaryExtension\CredentialValidator;
+use CloudinaryExtension\Security\CloudinaryEnvironmentVariable;
+
+/**
+ * Cloudinary_Cloudinary_Model_System_Config_Credentials
+ */
+class Cloudinary_Cloudinary_Model_System_Config_Credentials extends Mage_Adminhtml_Model_System_Config_Backend_Encrypted
+{
+    /**
+     * Encrypt value before saving
+     *
+     */
+    protected function _beforeSave()
+    {
+        $value = (string)$this->getValue();
+        if (preg_match('/^\*+$/', $value)) {
+            $value = $this->getOldValue();
+        }
+
+        $isValid = false;
+        try {
+            $credentialValidator = new CredentialValidator();
+            $environmentVariable = CloudinaryEnvironmentVariable::fromString($value);
+            $isValid = (bool) $credentialValidator->validate($environmentVariable->getCredentials());
+        } catch (\Exception $e) {
+            //Ignore errors
+        }
+
+        if (!$isValid) {
+            $this->setValue(null);
+            Mage::getSingleton('core/session')->addError(Cloudinary_Cloudinary_Model_Observer_Config::ERROR_WRONG_CREDENTIALS);
+        }
+
+        parent::_beforeSave();
+
+        Mage::register('cloudinaryEnvironmentVariable', $this->getValue());
+
+        return $this;
+    }
+}
diff --git a/app/code/community/Cloudinary/Cloudinary/Model/System/Config/Free.php b/app/code/community/Cloudinary/Cloudinary/Model/System/Config/Free.php
@@ -98,7 +98,7 @@ public function httpRequest($url)
      */
     public function hasAccountConfigured()
     {
-        return (string)$this->configuration->getCloud() !== '';
+        return Mage::registry('cloudinaryEnvironmentVariableIsValid');
     }
 
     /**

diff --git a/app/code/community/Cloudinary/Cloudinary/etc/config.xml b/app/code/community/Cloudinary/Cloudinary/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Cloudinary_Cloudinary>
-            <version>2.9.2</version>
+            <version>2.9.3</version>
         </Cloudinary_Cloudinary>
     </modules>
     <global>

diff --git a/app/code/community/Cloudinary/Cloudinary/etc/system.xml b/app/code/community/Cloudinary/Cloudinary/etc/system.xml
@@ -41,7 +41,7 @@
                             <label>Cloudinary Account Credentials</label>
                             <comment>Set the credentials of your Cloudinary account. Copy the "Environment variable" string from the dashboard of Cloudinary's Management Console.</comment>
                             <frontend_type>password</frontend_type>
-                            <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
+                            <backend_model>cloudinary_cloudinary/system_config_credentials</backend_model>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
@@ -136,7 +136,7 @@
                             <source_model>cloudinary_cloudinary/system_config_source_dropdown_dpr</source_model>
                         </cloudinary_image_dpr>
                         <cloudinary_free_transform_global>
-                            <label>Global custom transform</label>
+                            <label>Global custom transformation</label>
                             <frontend_type>text</frontend_type>
                             <sort_order>5</sort_order>
                             <show_in_default>1</show_in_default>

diff --git a/var/connect/Cloudinary_Cloudinary.xml b/var/connect/Cloudinary_Cloudinary.xml
@@ -1,6 +1,5 @@
 <_>
-   <form_key>FlphPtIaaCI8lVwe</form_key>
-   <_create/>
+   <form_key>pHIzpC9UKidsX254</form_key>
    <name>Cloudinary_Cloudinary</name>
    <channel>community</channel>
    <version_ids>
@@ -10,7 +9,7 @@
    <description>Cloudinary supercharges your images! Upload images to the cloud, deliver optimized via a fast CDN, perform smart resizing and apply effects.</description>
    <license>MIT License (MITL)</license>
    <license_uri/>
-   <version>2.9.2</version>
+   <version>2.9.3</version>
    <stability>stable</stability>
    <notes>      - Match MEQP1 coding standards
    </notes>
@@ -42,7 +41,7 @@
             <max/>
          </max>
          <files>
-            <files>                     </files>
+            <files>                       </files>
          </files>
       </package>
       <extension>

diff --git a/var/package/package.xml b/var/package/package.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,7 @@ public function httpRequest($url) @@
          */
         public function hasAccountConfigured()
         {
-            return (string)$this->configuration->getCloud() !== '';
+            return Mage::registry('cloudinaryEnvironmentVariableIsValid');
         }
         /**
@@ Expand Down @@