Handle argon failures robustly (#33856)

Author: GrahamCampbell

src/Illuminate/Hashing/ArgonHasher.php

@@ -60,13 +60,13 @@ public function __construct(array $options = [])
      */
     public function make($value, array $options = [])
     {
-        $hash = password_hash($value, $this->algorithm(), [
+        $hash = @password_hash($value, $this->algorithm(), [
             'memory_cost' => $this->memory($options),
             'time_cost' => $this->time($options),
             'threads' => $this->threads($options),
         ]);
 
-        if ($hash === false) {
+        if (! is_string($hash)) {
             throw new RuntimeException('Argon2 hashing not supported.');
         }
 

tests/Hashing/HasherTest.php

@@ -51,6 +51,9 @@ public function testBasicArgon2idHashing()
         $this->assertSame('argon2id', password_get_info($value)['algoName']);
     }
 
+    /**
+     * @depends testBasicBcryptHashing
+     */
     public function testBasicBcryptVerification()
     {
         $this->expectException(RuntimeException::class);
@@ -64,6 +67,9 @@ public function testBasicBcryptVerification()
         (new BcryptHasher(['verify' => true]))->check('password', $argonHashed);
     }
 
+    /**
+     * @depends testBasicArgon2iHashing
+     */
     public function testBasicArgon2iVerification()
     {
         $this->expectException(RuntimeException::class);
@@ -73,6 +79,9 @@ public function testBasicArgon2iVerification()
         (new ArgonHasher(['verify' => true]))->check('password', $bcryptHashed);
     }
 
+    /**
+     * @depends testBasicArgon2idHashing
+     */
     public function testBasicArgon2idVerification()
     {
         $this->expectException(RuntimeException::class);