Merge pull request from GHSA-crf2-xm6x-46p6

Flyingmana · web-flow · commit 7c526bc6a6a5 · 2020-08-18T19:19:54.000+02:00
diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php
@@ -389,7 +389,7 @@ protected function _validateSecretKey()
         }
 
         if (!($secretKey = $this->getRequest()->getParam(Mage_Adminhtml_Model_Url::SECRET_KEY_PARAM_NAME, null))
-            || $secretKey != Mage::getSingleton('adminhtml/url')->getSecretKey()) {
+            || !hash_equals(Mage::getSingleton('adminhtml/url')->getSecretKey(), $secretKey)) {
             return false;
         }
         return true;

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ protected function _validateSecretKey()`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`if (!($secretKey = $this->getRequest()->getParam(Mage_Adminhtml_Model_Url::SECRET_KEY_PARAM_NAME, null))`
`392`		`- \|\| $secretKey != Mage::getSingleton('adminhtml/url')->getSecretKey()) {`
	`392`	`+ \|\| !hash_equals(Mage::getSingleton('adminhtml/url')->getSecretKey(), $secretKey)) {`
`393`	`393`	`return false;`
`394`	`394`	`}`
`395`	`395`	`return true;`