From bcb6f189f70b4af9c90016bd45e17eb7ee6609fa Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 8 Oct 2011 22:41:52 -0500 Subject: [PATCH] refactored bcrypt hashing engine. --- application/config/aliases.php | 2 +- laravel/bootstrap/core.php | 10 +- laravel/bootstrap/functions.php | 16 -- laravel/config/container.php | 5 - laravel/container.php | 4 +- laravel/security/hasher.php | 64 +++++++ laravel/security/hashing/bcrypt.php | 254 ---------------------------- laravel/security/hashing/engine.php | 22 --- laravel/str.php | 32 +++- 9 files changed, 103 insertions(+), 306 deletions(-) delete mode 100644 laravel/bootstrap/functions.php create mode 100644 laravel/security/hasher.php delete mode 100644 laravel/security/hashing/bcrypt.php delete mode 100644 laravel/security/hashing/engine.php diff --git a/application/config/aliases.php b/application/config/aliases.php index ed7d0921..a6a2103e 100644 --- a/application/config/aliases.php +++ b/application/config/aliases.php @@ -31,7 +31,7 @@ 'Eloquent' => 'Laravel\\Database\\Eloquent\\Model', 'File' => 'Laravel\\File', 'Form' => 'Laravel\\Form', - 'Hasher' => 'Laravel\\Facades\\Hasher', + 'Hasher' => 'Laravel\\Security\\Hasher', 'HTML' => 'Laravel\\HTML', 'Inflector' => 'Laravel\\Inflector', 'Input' => 'Laravel\\Input', diff --git a/laravel/bootstrap/core.php b/laravel/bootstrap/core.php index 26e25614..e11a52be 100644 --- a/laravel/bootstrap/core.php +++ b/laravel/bootstrap/core.php @@ -87,4 +87,12 @@ /** * Define a few convenient global functions. */ -require 'functions'.EXT; \ No newline at end of file +function e($value) +{ + return HTML::entities($value); +} + +function __($key, $replacements = array(), $language = null) +{ + return Lang::line($key, $replacements, $language); +} \ No newline at end of file diff --git a/laravel/bootstrap/functions.php b/laravel/bootstrap/functions.php deleted file mode 100644 index 9928ed45..00000000 --- a/laravel/bootstrap/functions.php +++ /dev/null @@ -1,16 +0,0 @@ - array('singleton' => true, 'resolver' => function($c) - { - return new Security\Hashing\Bcrypt(8, false); - }), - /* |-------------------------------------------------------------------------- | Laravel Routing Components diff --git a/laravel/container.php b/laravel/container.php index 6a7f07b8..32f076d8 100644 --- a/laravel/container.php +++ b/laravel/container.php @@ -135,13 +135,13 @@ public function instance($name, $instance) * * * // Resolve the "laravel.router" class from the container - * $input = IoC::container()->core('input'); + * $input = IoC::container()->core('router'); * * // Equivalent resolution using the "resolve" method * $input = IoC::container()->resolve('laravel.router'); * * // Pass an array of parameters to the resolver - * $input = IoC::container()->core('input', array('test')); + * $input = IoC::container()->core('router', array('test')); * * * @param string $name diff --git a/laravel/security/hasher.php b/laravel/security/hasher.php new file mode 100644 index 00000000..8f31a96c --- /dev/null +++ b/laravel/security/hasher.php @@ -0,0 +1,64 @@ + + * // Create a Bcrypt hash of a value + * $hash = Hasher::hash('secret'); + * + * // Use a specified number of iterations when creating the hash + * $hash = Hasher::hash('secret', 12); + * + * + * @param string $value + * @param int $rounds + * @return string + */ + public static function hash($value, $rounds = 8) + { + return crypt($value, '$2a$'.str_pad($rounds, 2, '0', STR_PAD_LEFT).'$'.static::salt()); + } + + /** + * Determine if an unhashed value matches a given Bcrypt hash. + * + * Since the number of rounds is included in the Bcrypt hash, it is not + * necessary to specify the rounds when calling this method. + * + * @param string $value + * @param string $hash + * @return bool + */ + public static function check($value, $hash) + { + return crypt($value, $hash) === $hash; + } + + /** + * Get a salt for use during Bcrypt hashing. + * + * @return string + */ + protected static function salt() + { + // If OpenSSL is installed, we will use it to gather random bytes for generating + // the salt value. Otherwise, we will use the Str::random method. Bcrypt expects + // the salt to be a 22 character alpha-numeric string. The salt may also contain + // dots, plus signs, and forward slashes. + if (function_exists('openssl_random_pseudo_bytes')) + { + return substr(strtr(base64_encode(openssl_random_pseudo_bytes(16)), '+', '.'), 0 , 22); + } + + return substr(str_replace('+', '.', base64_encode(Str::random(40))), 0, 22); + } + +} \ No newline at end of file diff --git a/laravel/security/hashing/bcrypt.php b/laravel/security/hashing/bcrypt.php deleted file mode 100644 index 0e89af31..00000000 --- a/laravel/security/hashing/bcrypt.php +++ /dev/null @@ -1,254 +0,0 @@ - in 2004-2006 and placed in -// the public domain. Revised in subsequent years, still public domain. -// -// There's absolutely no warranty. -// -// The homepage URL for this framework is: -// -// http://www.openwall.com/phpass/ -// -// Please be sure to update the Version line if you edit this file in any way. -// It is suggested that you leave the main version number intact, but indicate -// your project name (after the slash) and add your own revision information. -// -// Please do not change the "private" password hashing method implemented in -// here, thereby making your hashes incompatible. However, if you must, please -// change the hash type identifier (the "$P$") to something different. -// -// Obviously, since this code is in the public domain, the above are not -// requirements (there can be none), but merely suggestions. -// -class Bcrypt implements Engine { - var $itoa64; - var $iteration_count_log2; - var $portable_hashes; - var $random_state; - - public function __construct($iteration_count_log2, $portable_hashes) - { - $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; - - if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) - $iteration_count_log2 = 8; - $this->iteration_count_log2 = $iteration_count_log2; - - $this->portable_hashes = $portable_hashes; - - $this->random_state = microtime(); - if (function_exists('getmypid')) - $this->random_state .= getmypid(); - } - - protected function get_random_bytes($count) - { - $output = ''; - if (is_readable('/dev/urandom') && - ($fh = @fopen('/dev/urandom', 'rb'))) { - $output = fread($fh, $count); - fclose($fh); - } - - if (strlen($output) < $count) { - $output = ''; - for ($i = 0; $i < $count; $i += 16) { - $this->random_state = - md5(microtime() . $this->random_state); - $output .= - pack('H*', md5($this->random_state)); - } - $output = substr($output, 0, $count); - } - - return $output; - } - - protected function encode64($input, $count) - { - $output = ''; - $i = 0; - do { - $value = ord($input[$i++]); - $output .= $this->itoa64[$value & 0x3f]; - if ($i < $count) - $value |= ord($input[$i]) << 8; - $output .= $this->itoa64[($value >> 6) & 0x3f]; - if ($i++ >= $count) - break; - if ($i < $count) - $value |= ord($input[$i]) << 16; - $output .= $this->itoa64[($value >> 12) & 0x3f]; - if ($i++ >= $count) - break; - $output .= $this->itoa64[($value >> 18) & 0x3f]; - } while ($i < $count); - - return $output; - } - - protected function gensalt_private($input) - { - $output = '$P$'; - $output .= $this->itoa64[min($this->iteration_count_log2 + - ((PHP_VERSION >= '5') ? 5 : 3), 30)]; - $output .= $this->encode64($input, 6); - - return $output; - } - - protected function crypt_private($password, $setting) - { - $output = '*0'; - if (substr($setting, 0, 2) == $output) - $output = '*1'; - - $id = substr($setting, 0, 3); - # We use "$P$", phpBB3 uses "$H$" for the same thing - if ($id != '$P$' && $id != '$H$') - return $output; - - $count_log2 = strpos($this->itoa64, $setting[3]); - if ($count_log2 < 7 || $count_log2 > 30) - return $output; - - $count = 1 << $count_log2; - - $salt = substr($setting, 4, 8); - if (strlen($salt) != 8) - return $output; - - // We're kind of forced to use MD5 here since it's the only - // cryptographic primitive available in all versions of PHP - // currently in use. To implement our own low-level crypto - // in PHP would result in much worse performance and - // consequently in lower iteration counts and hashes that are - // quicker to crack (by non-PHP code). - if (PHP_VERSION >= '5') { - $hash = md5($salt . $password, TRUE); - do { - $hash = md5($hash . $password, TRUE); - } while (--$count); - } else { - $hash = pack('H*', md5($salt . $password)); - do { - $hash = pack('H*', md5($hash . $password)); - } while (--$count); - } - - $output = substr($setting, 0, 12); - $output .= $this->encode64($hash, 16); - - return $output; - } - - protected function gensalt_extended($input) - { - $count_log2 = min($this->iteration_count_log2 + 8, 24); - // This should be odd to not reveal weak DES keys, and the - // maximum valid value is (2**24 - 1) which is odd anyway. - $count = (1 << $count_log2) - 1; - - $output = '_'; - $output .= $this->itoa64[$count & 0x3f]; - $output .= $this->itoa64[($count >> 6) & 0x3f]; - $output .= $this->itoa64[($count >> 12) & 0x3f]; - $output .= $this->itoa64[($count >> 18) & 0x3f]; - - $output .= $this->encode64($input, 3); - - return $output; - } - - protected function gensalt_blowfish($input) - { - // This one needs to use a different order of characters and a - // different encoding scheme from the one in encode64() above. - // We care because the last character in our encoded string will - // only represent 2 bits. While two known implementations of - // bcrypt will happily accept and correct a salt string which - // has the 4 unused bits set to non-zero, we do not want to take - // chances and we also do not want to waste an additional byte - // of entropy. - $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - - $output = '$2a$'; - $output .= chr(ord('0') + $this->iteration_count_log2 / 10); - $output .= chr(ord('0') + $this->iteration_count_log2 % 10); - $output .= '$'; - - $i = 0; - do { - $c1 = ord($input[$i++]); - $output .= $itoa64[$c1 >> 2]; - $c1 = ($c1 & 0x03) << 4; - if ($i >= 16) { - $output .= $itoa64[$c1]; - break; - } - - $c2 = ord($input[$i++]); - $c1 |= $c2 >> 4; - $output .= $itoa64[$c1]; - $c1 = ($c2 & 0x0f) << 2; - - $c2 = ord($input[$i++]); - $c1 |= $c2 >> 6; - $output .= $itoa64[$c1]; - $output .= $itoa64[$c2 & 0x3f]; - } while (1); - - return $output; - } - - public function hash($password) - { - $random = ''; - - if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) { - $random = $this->get_random_bytes(16); - $hash = - crypt($password, $this->gensalt_blowfish($random)); - if (strlen($hash) == 60) - return $hash; - } - - if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) { - if (strlen($random) < 3) - $random = $this->get_random_bytes(3); - $hash = - crypt($password, $this->gensalt_extended($random)); - if (strlen($hash) == 20) - return $hash; - } - - if (strlen($random) < 6) - $random = $this->get_random_bytes(6); - $hash = - $this->crypt_private($password, - $this->gensalt_private($random)); - if (strlen($hash) == 34) - return $hash; - - // Returning '*' on error is safe here, but would _not_ be safe - // in a crypt(3)-like function used _both_ for generating new - // hashes and for validating passwords against existing hashes. - return '*'; - } - - public function check($password, $stored_hash) - { - $hash = $this->crypt_private($password, $stored_hash); - if ($hash[0] == '*') - $hash = crypt($password, $stored_hash); - - return $hash == $stored_hash; - } -} - -?> diff --git a/laravel/security/hashing/engine.php b/laravel/security/hashing/engine.php deleted file mode 100644 index f1595d3c..00000000 --- a/laravel/security/hashing/engine.php +++ /dev/null @@ -1,22 +0,0 @@ -