1berry/YOURLS
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update phpass

Browse Source 
Use more modern package from hautelook/phpass, but keep 5.3-5.5 compat
Also, remove that test file. This should never have been included in the first place.
This commit is contained in:
ozh 2017-04-20 11:12:05 +02:00
parent 51a3d3beab
commit 0571793c0b
5 changed files with 334 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/functions-auth.php
View File

@ -229,14 +229,14 @@ function yourls_phpass_check( $password, $hash ) {
function yourls_phpass_instance( $iteration = 8, $portable = false ) { function yourls_phpass_instance( $iteration = 8, $portable = false ) {
$iteration = yourls_apply_filter( 'phpass_new_instance_iteration', $iteration ); $iteration = yourls_apply_filter( 'phpass_new_instance_iteration', $iteration );
$portable = yourls_apply_filter( 'phpass_new_instance_portable', $portable ); $portable = yourls_apply_filter( 'phpass_new_instance_portable', $portable );
if( !class_exists( 'PasswordHash' ) ) { if( !class_exists( 'Hautelook\Phpass\PasswordHash' ) ) {
require_once( YOURLS_INC.'/phpass/PasswordHash.php' ); require_once( YOURLS_INC.'/phpass/PasswordHash.php' );
} }
static $instance = false; static $instance = false;
if( $instance == false ) { if( $instance == false ) {
$instance = new PasswordHash( $iteration, $portable ); $instance = new Hautelook\Phpass\PasswordHash( $iteration, $portable );
} }
return $instance; return $instance;

44
includes/functions-compat.php
View File

@ -222,3 +222,47 @@ function yourls_mb_strlen( $str, $encoding = null ) {
// Fencepost: preg_split() always returns one extra item in the array // Fencepost: preg_split() always returns one extra item in the array
return --$count; return --$count;
} }
/**
* hash_equals compatibility function. Stolen from Code Igniter
*
* Source: https://github.com/bcit-ci/CodeIgniter/blob/3.1.4/system/core/compat/hash.php
* For PHP < 5.6
*
* @since 1.7.2
*/
if ( ! function_exists('hash_equals'))
{
/**
* hash_equals()
*
* @link http://php.net/hash_equals
* @param string $known_string
* @param string $user_string
* @return bool
*/
function hash_equals($known_string, $user_string)
{
if ( ! is_string($known_string))
{
trigger_error('hash_equals(): Expected known_string to be a string, '.strtolower(gettype($known_string)).' given', E_USER_WARNING);
return FALSE;
}
elseif ( ! is_string($user_string))
{
trigger_error('hash_equals(): Expected user_string to be a string, '.strtolower(gettype($user_string)).' given', E_USER_WARNING);
return FALSE;
}
elseif (($length = strlen($known_string)) !== strlen($user_string))
{
return FALSE;
}
$diff = 0;
for ($i = 0; $i < $length; $i++)
{
$diff |= ord($known_string[$i]) ^ ord($user_string[$i]);
}
return ($diff === 0);
}
}

501
includes/phpass/PasswordHash.php
View File

@ -1,253 +1,324 @@
<?php <?php
#
# Portable PHP password hashing framework.
#
# Version 0.3 / genuine.
#
# Written by Solar Designer <solar at openwall.com> 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 PasswordHash {
var $itoa64;
var $iteration_count_log2;
var $portable_hashes;
var $random_state;
function __construct($iteration_count_log2, $portable_hashes) namespace Hautelook\Phpass;
{
$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) /**
$iteration_count_log2 = 8; *
$this->iteration_count_log2 = $iteration_count_log2; * Portable PHP password hashing framework.
*
* Version 1.0.0 - modified by Nordstromrack.com | HauteLook
*
* Change Log:
*
* - the hash_equals function is now used instead of == or === to prevent
* timing attacks
*
* Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
*
* 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.
*
* @author Solar Designer <solar@openwall.com>
*/
class PasswordHash
{
private $itoa64;
private $iteration_count_log2;
private $portable_hashes;
private $random_state;
$this->portable_hashes = $portable_hashes; /**
* Constructor
*
* @param int $iteration_count_log2
* @param boolean $portable_hashes
*/
public function __construct($iteration_count_log2, $portable_hashes)
{
$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
$this->random_state = microtime(); if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) {
if (function_exists('getmypid')) $iteration_count_log2 = 8;
$this->random_state .= getmypid(); }
} $this->iteration_count_log2 = $iteration_count_log2;
function get_random_bytes($count) $this->portable_hashes = $portable_hashes;
{
$output = '';
if (is_readable('/dev/urandom') &&
($fh = @fopen('/dev/urandom', 'rb'))) {
$output = fread($fh, $count);
fclose($fh);
}
if (strlen($output) < $count) { $this->random_state = microtime();
$output = ''; if (function_exists('getmypid')) {
for ($i = 0; $i < $count; $i += 16) { $this->random_state .= getmypid();
$this->random_state = }
md5(microtime() . $this->random_state); }
$output .=
pack('H*', md5($this->random_state));
}
$output = substr($output, 0, $count);
}
return $output; /**
} * @param int $count
* @return String
*/
public function get_random_bytes($count)
{
$output = '';
if (is_callable('random_bytes')) {
return random_bytes($count);
}
if (@is_readable('/dev/urandom') &&
($fh = @fopen('/dev/urandom', 'rb'))) {
$output = fread($fh, $count);
fclose($fh);
}
function encode64($input, $count) if (strlen($output) < $count) {
{ $output = '';
$output = ''; for ($i = 0; $i < $count; $i += 16) {
$i = 0; $this->random_state =
do { md5(microtime() . $this->random_state);
$value = ord($input[$i++]); $output .=
$output .= $this->itoa64[$value & 0x3f]; pack('H*', md5($this->random_state));
if ($i < $count) }
$value |= ord($input[$i]) << 8; $output = substr($output, 0, $count);
$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; return $output;
} }
function gensalt_private($input) /**
{ * @param String $input
$output = '$P$'; * @param int $count
$output .= $this->itoa64[min($this->iteration_count_log2 + * @return String
((PHP_VERSION >= '5') ? 5 : 3), 30)]; */
$output .= $this->encode64($input, 6); public 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; return $output;
} }
function crypt_private($password, $setting) /**
{ * @param String $input
$output = '*0'; * @return String
if (substr($setting, 0, 2) == $output) */
$output = '*1'; public 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);
$id = substr($setting, 0, 3); return $output;
# 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) * @param String $password
return $output; * @param String $setting
* @return String
*/
public function crypt_private($password, $setting)
{
$output = '*0';
if (substr($setting, 0, 2) == $output) {
$output = '*1';
}
$count = 1 << $count_log2; $id = substr($setting, 0, 3);
# We use "$P$", phpBB3 uses "$H$" for the same thing
if ($id != '$P$' && $id != '$H$') {
return $output;
}
$salt = substr($setting, 4, 8); $count_log2 = strpos($this->itoa64, $setting[3]);
if (strlen($salt) != 8) if ($count_log2 < 7 || $count_log2 > 30) {
return $output; return $output;
}
# We're kind of forced to use MD5 here since it's the only $count = 1 << $count_log2;
# 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); $salt = substr($setting, 4, 8);
$output .= $this->encode64($hash, 16); if (strlen($salt) != 8) {
return $output;
}
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);
}
function gensalt_extended($input) $output = substr($setting, 0, 12);
{ $output .= $this->encode64($hash, 16);
$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 = '_'; return $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); /**
* @param String $input
* @return String
*/
public 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;
return $output; $output = '_';
} $output .= $this->itoa64[$count & 0x3f];
$output .= $this->itoa64[($count >> 6) & 0x3f];
$output .= $this->itoa64[($count >> 12) & 0x3f];
$output .= $this->itoa64[($count >> 18) & 0x3f];
function gensalt_blowfish($input) $output .= $this->encode64($input, 3);
{
# 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$'; return $output;
$output .= chr(ord('0') + $this->iteration_count_log2 / 10); }
$output .= chr(ord('0') + $this->iteration_count_log2 % 10);
$output .= '$';
$i = 0; /**
do { * @param String $input
$c1 = ord($input[$i++]); * @return String
$output .= $itoa64[$c1 >> 2]; */
$c1 = ($c1 & 0x03) << 4; public function gensalt_blowfish($input)
if ($i >= 16) { {
$output .= $itoa64[$c1]; // This one needs to use a different order of characters and a
break; // 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';
$c2 = ord($input[$i++]); $output = '$2a$';
$c1 |= $c2 >> 4; $output .= chr(ord('0') + $this->iteration_count_log2 / 10);
$output .= $itoa64[$c1]; $output .= chr(ord('0') + $this->iteration_count_log2 % 10);
$c1 = ($c2 & 0x0f) << 2; $output .= '$';
$c2 = ord($input[$i++]); $i = 0;
$c1 |= $c2 >> 6; do {
$output .= $itoa64[$c1]; $c1 = ord($input[$i++]);
$output .= $itoa64[$c2 & 0x3f]; $output .= $itoa64[$c1 >> 2];
} while (1); $c1 = ($c1 & 0x03) << 4;
if ($i >= 16) {
$output .= $itoa64[$c1];
break;
}
return $output; $c2 = ord($input[$i++]);
} $c1 |= $c2 >> 4;
$output .= $itoa64[$c1];
$c1 = ($c2 & 0x0f) << 2;
function HashPassword($password) $c2 = ord($input[$i++]);
{ $c1 |= $c2 >> 6;
$random = ''; $output .= $itoa64[$c1];
$output .= $itoa64[$c2 & 0x3f];
} while (1);
if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) { return $output;
$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) * @param String $password
$random = $this->get_random_bytes(3); */
$hash = public function HashPassword($password)
crypt($password, $this->gensalt_extended($random)); {
if (strlen($hash) == 20) $random = '';
return $hash;
}
if (strlen($random) < 6) if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
$random = $this->get_random_bytes(6); $random = $this->get_random_bytes(16);
$hash = $hash =
$this->crypt_private($password, crypt($password, $this->gensalt_blowfish($random));
$this->gensalt_private($random)); if (strlen($hash) == 60) {
if (strlen($hash) == 34) return $hash;
return $hash; }
}
# Returning '*' on error is safe here, but would _not_ be safe if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
# in a crypt(3)-like function used _both_ for generating new if (strlen($random) < 3) {
# hashes and for validating passwords against existing hashes. $random = $this->get_random_bytes(3);
return '*'; }
} $hash =
crypt($password, $this->gensalt_extended($random));
if (strlen($hash) == 20) {
return $hash;
}
}
function CheckPassword($password, $stored_hash) if (strlen($random) < 6) {
{ $random = $this->get_random_bytes(6);
$hash = $this->crypt_private($password, $stored_hash); }
if ($hash[0] == '*')
$hash = crypt($password, $stored_hash);
return $hash == $stored_hash; $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 '*';
}
/**
* @param String $password
* @param String $stored_hash
* @return boolean
*/
public function CheckPassword($password, $stored_hash)
{
$hash = $this->crypt_private($password, $stored_hash);
if ($hash[0] == '*') {
$hash = crypt($password, $stored_hash);
}
return hash_equals($stored_hash, $hash);
}
} }
?>

2
includes/phpass/README.md
View File

@ -3,4 +3,4 @@ phpass
**phpass** (pronounced "pH pass") is a portable public domain password hashing framework **phpass** (pronounced "pH pass") is a portable public domain password hashing framework
**phpass** can be found here : http://openwall.com/phpass/ https://github.com/hautelook/phpass

72
includes/phpass/test.php
View File

@ -1,72 +0,0 @@
<?php
#
# This is a test program for the portable PHP password hashing framework.
#
# Written by Solar Designer and placed in the public domain.
# See PasswordHash.php for more information.
#
require 'PasswordHash.php';
header('Content-type: text/plain');
$ok = 0;
# Try to use stronger but system-specific hashes, with a possible fallback to
# the weaker portable hashes.
$t_hasher = new PasswordHash(8, FALSE);
$correct = 'test12345';
$hash = $t_hasher->HashPassword($correct);
print 'Hash: ' . $hash . "\n";
$check = $t_hasher->CheckPassword($correct, $hash);
if ($check) $ok++;
print "Check correct: '" . $check . "' (should be '1')\n";
$wrong = 'test12346';
$check = $t_hasher->CheckPassword($wrong, $hash);
if (!$check) $ok++;
print "Check wrong: '" . $check . "' (should be '0' or '')\n";
unset($t_hasher);
# Force the use of weaker portable hashes.
$t_hasher = new PasswordHash(8, TRUE);
$hash = $t_hasher->HashPassword($correct);
print 'Hash: ' . $hash . "\n";
$check = $t_hasher->CheckPassword($correct, $hash);
if ($check) $ok++;
print "Check correct: '" . $check . "' (should be '1')\n";
$check = $t_hasher->CheckPassword($wrong, $hash);
if (!$check) $ok++;
print "Check wrong: '" . $check . "' (should be '0' or '')\n";
# A correct portable hash for 'test12345'.
# Please note the use of single quotes to ensure that the dollar signs will
# be interpreted literally. Of course, a real application making use of the
# framework won't store password hashes within a PHP source file anyway.
# We only do this for testing.
$hash = '$P$9IQRaTwmfeRo7ud9Fh4E2PdI0S3r.L0';
print 'Hash: ' . $hash . "\n";
$check = $t_hasher->CheckPassword($correct, $hash);
if ($check) $ok++;
print "Check correct: '" . $check . "' (should be '1')\n";
$check = $t_hasher->CheckPassword($wrong, $hash);
if (!$check) $ok++;
print "Check wrong: '" . $check . "' (should be '0' or '')\n";
if ($ok == 6)
print "All tests have PASSED\n";
else
print "Some tests have FAILED\n";
?>