#11253 Check hash algorithm availability

cakephp · Oct 6, 2017 · 9fe8944 · 9fe8944
1 parent b3dd206
commit 9fe8944
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/Utility/Security.php b/src/Utility/Security.php
@@ -66,6 +66,15 @@ public static function hash($string, $type = null, $salt = false)
         }
         $type = strtolower($type);
 
+        $hashAlgos = hash_algos();
+        if (!in_array($type, $hashAlgos)) {
+            throw new RuntimeException(sprintf(
+                'The hash type `%s` was not found. Available algorithms are: %s',
+                $type,
+                implode(', ', $hashAlgos)
+            ));
+        }
+
         if ($salt) {
             if (!is_string($salt)) {
                 $salt = static::$_salt;

diff --git a/tests/TestCase/Utility/SecurityTest.php b/tests/TestCase/Utility/SecurityTest.php
@@ -69,6 +69,20 @@ public function testHash()
         Security::setHash($_hashType);
     }
 
+    /**
+     * testInvalidHashTypeException
+     *
+     * @return void
+     */
+    public function testInvalidHashTypeException() {
+        try {
+            Security::hash('test', 'doesnotexist', false);
+            $this->fail('Expected \RuntimeException');
+        } catch (\RuntimeException $e) {
+            $this->assertTextContains('The hash type `doesnotexist` was not found. Available algorithms are:', $e->getMessage());
+        }
+    }
+
     /**
      * testRijndael method
      *