Merge branch 'add_argon2_support' of https://github.com/morloderex/fr…

…amework

src/Illuminate/Foundation/Application.php

@@ -1111,7 +1111,7 @@ public function registerCoreContainerAliases()
             'filesystem'           => [\Illuminate\Filesystem\FilesystemManager::class, \Illuminate\Contracts\Filesystem\Factory::class],
             'filesystem.disk'      => [\Illuminate\Contracts\Filesystem\Filesystem::class],
             'filesystem.cloud'     => [\Illuminate\Contracts\Filesystem\Cloud::class],
-            'hash'                 => [\Illuminate\Contracts\Hashing\Hasher::class],
+            'hash'                 => [\Illuminate\Hashing\HashManager::class],
             'translator'           => [\Illuminate\Translation\Translator::class, \Illuminate\Contracts\Translation\Translator::class],
             'log'                  => [\Illuminate\Log\Writer::class, \Illuminate\Contracts\Logging\Log::class, \Psr\Log\LoggerInterface::class],
             'mailer'               => [\Illuminate\Mail\Mailer::class, \Illuminate\Contracts\Mail\Mailer::class, \Illuminate\Contracts\Mail\MailQueue::class],

src/Illuminate/Foundation/helpers.php

@@ -185,15 +185,17 @@ function base_path($path = '')
 
 if (! function_exists('bcrypt')) {
     /**
-     * Hash the given value.
+     * Hash the given value against the bcrypt algorithm.
      *
      * @param  string  $value
      * @param  array   $options
      * @return string
      */
     function bcrypt($value, $options = [])
     {
-        return app('hash')->make($value, $options);
+        return app('hash')
+            ->driver('bcrypt')
+            ->make($value, $options);
     }
 }
 

src/Illuminate/Hashing/ArgonHasher.php

@@ -0,0 +1,160 @@
+<?php
+
+namespace Illuminate\Hashing;
+
+use RuntimeException;
+use Illuminate\Contracts\Hashing\Hasher as HasherContract;
+
+class ArgonHasher implements HasherContract
+{
+    /**
+     * Default threads factor.
+     *
+     * @var int
+     */
+    protected $processors = 2;
+
+    /**
+     * Default memory cost factor.
+     *
+     * @var int
+     */
+    protected $memory = 1024;
+
+    /**
+     * Default time cost factor.
+     *
+     * @var int
+     */
+    protected $time = 2;
+
+    /**
+     * Hash the given value.
+     *
+     * @param  string $value
+     * @param  array $options
+     * @return string
+     */
+    public function make($value, array $options = [])
+    {
+        $hash = password_hash($value, PASSWORD_ARGON2I, [
+            'memory_cost' => $this->memory($options),
+            'time_cost' => $this->time($options),
+            'threads' => $this->processors($options)
+        ]);
+
+        if ($hash === false) {
+            throw new RuntimeException('Argon2 hashing not supported.');
+        }
+
+        return $hash;
+    }
+
+    /**
+     * Check the given plain value against a hash.
+     *
+     * @param  string $value
+     * @param  string $hashedValue
+     * @param  array $options
+     * @return bool
+     */
+    public function check($value, $hashedValue, array $options = [])
+    {
+        if (strlen($hashedValue) === 0) {
+            return false;
+        }
+
+        return password_verify($value, $hashedValue);
+    }
+
+    /**
+     * Check if the given hash has been hashed using the given options.
+     *
+     * @param  string $hashedValue
+     * @param  array $options
+     * @return bool
+     */
+    public function needsRehash($hashedValue, array $options = [])
+    {
+        return password_needs_rehash($hashedValue, PASSWORD_ARGON2I, [
+            'memory_cost' => $this->memory($options),
+            'time_cost' => $this->time($options),
+            'threads' => $this->processors($options)
+        ]);
+    }
+
+    /**
+     * Set the default password threads factor.
+     *
+     * @param int $threads
+     *
+     * @return $this;
+     */
+    public function setProcessors(int $threads)
+    {
+        $this->threads = $threads;
+
+        return $this;
+    }
+
+    /**
+     * Set the default password memory factor.
+     *
+     * @param int $memory
+     *
+     * @return $this
+     */
+    public function setMemory(int $memory)
+    {
+        $this->memory = $memory;
+
+        return $this;
+    }
+
+    /**
+     * Set the default password timing factor.
+     *
+     * @param int $time
+     *
+     * @return $this
+     */
+    public function setTime(int $time)
+    {
+        $this->time = $time;
+
+        return $this;
+    }
+
+    /**
+     * Extract the memory cost value from the options array.
+     *
+     * @param $options
+     * @return int
+     */
+    protected function memory($options)
+    {
+        return $options['memory'] ?? $this->memory;
+    }
+
+    /**
+     * Extract the time cost value from the options array.
+     *
+     * @param $options
+     * @return int
+     */
+    protected function time($options)
+    {
+        return $options['time'] ?? $this->time;
+    }
+
+    /**
+     * Extract the threads value from the options array.
+     *
+     * @param $options
+     * @return int
+     */
+    protected function processors($options)
+    {
+        return $options['processors'] ?? $this->processors;
+    }
+}

src/Illuminate/Hashing/HashManager.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Illuminate\Hashing;
+
+use Illuminate\Support\Manager;
+
+class HashManager extends Manager
+{
+    /**
+     * Get the default driver name.
+     *
+     * @return string
+     */
+    public function getDefaultDriver()
+    {
+        return $this->app['config']['hashing.driver'];
+    }
+
+    /**
+     * Create an instance of the Brycrypt hash Driver.
+     *
+     * @return BcryptHasher
+     */
+    public function createBcryptDriver()
+    {
+        return new BcryptHasher;
+    }
+
+    /**
+     * Create an instance of the Argon2 hash Driver.
+     *
+     * @return ArgonHasher
+     */
+    public function createArgonDriver()
+    {
+        return new ArgonHasher;
+    }
+}

src/Illuminate/Hashing/HashServiceProvider.php

@@ -20,8 +20,8 @@ class HashServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('hash', function () {
-            return new BcryptHasher;
+        $this->app->singleton('hash', function ($app) {
+            return new HashManager($app);
         });
     }
 

tests/Hashing/HasherTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Illuminate\Tests\Hashing;
+
+use PHPUnit\Framework\TestCase;
+
+class HasherTest extends TestCase
+{
+    public function testBasicBcryptHashing()
+    {
+        $hasher = new \Illuminate\Hashing\BcryptHasher;
+        $value = $hasher->make('password');
+        $this->assertNotSame('password', $value);
+        $this->assertTrue($hasher->check('password', $value));
+        $this->assertFalse($hasher->needsRehash($value));
+        $this->assertTrue($hasher->needsRehash($value, ['rounds' => 1]));
+    }
+
+    public function testBasicArgonHashing()
+    {
+        if (! defined('PASSWORD_ARGON2I')) {
+            $this->markTestSkipped('PHP not compiled with argon2 hashing support support.');
+        }
+
+        $hasher = new \Illuminate\Hashing\ArgonHasher;
+        $value = $hasher->make('password');
+        $this->assertNotSame('password', $value);
+        $this->assertTrue($hasher->check('password', $value));
+        $this->assertFalse($hasher->needsRehash($value));
+        $this->assertTrue($hasher->needsRehash($value, ['processors' => 1]));
+    }
+}

tests/Integration/Auth/AuthenticationTest.php

@@ -24,6 +24,8 @@ protected function getEnvironmentSetUp($app)
             'database' => ':memory:',
             'prefix' => '',
         ]);
+
+        $app['config']->set('hashing', ['driver' => 'bcrypt']);
     }
 
     public function setUp()

tests/Integration/Http/ThrottleRequestsTest.php

@@ -19,6 +19,11 @@ public function tearDown()
         Carbon::setTestNow(null);
     }
 
+    public function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('hashing', ['driver' => 'bcrypt']);
+    }
+
     public function test_lock_opens_immediately_after_decay()
     {
         Carbon::setTestNow(null);

tests/Integration/Http/ThrottleRequestsWithRedisTest.php

@@ -22,6 +22,11 @@ public function tearDown()
         Carbon::setTestNow(null);
     }
 
+    public function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('hashing', ['driver' => 'bcrypt']);
+    }
+
     public function test_lock_opens_immediately_after_decay()
     {
         $this->ifRedisAvailable(function () {