makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13203] Use string_compare method in passwords drivers

Browse source 
PHPBB3-13203
This commit is contained in:
Marc Alexander 2014-10-22 14:54:55 -05:00
parent 2b47ef1266
commit 0bc04a4df0
12 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/password.yml
View file

@ -101,6 +101,7 @@ services:
arguments: arguments:
- @request - @request
- @passwords.driver.salted_md5 - @passwords.driver.salted_md5
- @passwords.driver_helper
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
tags: tags:

2
phpBB/phpbb/passwords/driver/bcrypt.php
View file

@ -68,7 +68,7 @@ class bcrypt extends base
return false; return false;
} }
if ($hash == $this->hash($password, $salt)) if ($this->helper->string_compare($hash, $this->hash($password, $salt)))
{ {
return true; return true;
} }

2
phpBB/phpbb/passwords/driver/bcrypt_wcf2.php
View file

@ -78,7 +78,7 @@ class bcrypt_wcf2 extends base
return false; return false;
} }
// Works for standard WCF 2.x, i.e. WBB4 and similar // Works for standard WCF 2.x, i.e. WBB4 and similar
return $hash === $this->bcrypt->hash($this->bcrypt->hash($password, $salt), $salt); return $this->helper->string_compare($hash, $this->bcrypt->hash($this->bcrypt->hash($password, $salt), $salt));
} }
} }
} }

2
phpBB/phpbb/passwords/driver/md5_mybb.php
View file

@ -54,7 +54,7 @@ class md5_mybb extends base
else else
{ {
// Works for myBB 1.1.x, 1.2.x, 1.4.x, 1.6.x // Works for myBB 1.1.x, 1.2.x, 1.4.x, 1.6.x
return $hash === md5(md5($user_row['user_passwd_salt']) . md5($password)); return $this->helper->string_compare($hash, md5(md5($user_row['user_passwd_salt']) . md5($password)));
} }
} }
} }

9
phpBB/phpbb/passwords/driver/md5_phpbb2.php
View file

@ -23,6 +23,9 @@ class md5_phpbb2 extends base
/** @var \phpbb\passwords\driver\salted_md5 */ /** @var \phpbb\passwords\driver\salted_md5 */
protected $salted_md5; protected $salted_md5;
/** @var \phpbb\passwords\driver\helper */
protected $helper;
/** @var string phpBB root path */ /** @var string phpBB root path */
protected $phpbb_root_path; protected $phpbb_root_path;
@ -34,13 +37,15 @@ class md5_phpbb2 extends base
* *
* @param \phpbb\request\request $request phpBB request object * @param \phpbb\request\request $request phpBB request object
* @param \phpbb\passwords\driver\salted_md5 $salted_md5 Salted md5 driver * @param \phpbb\passwords\driver\salted_md5 $salted_md5 Salted md5 driver
* @param \phpbb\passwords\driver\helper $helper Driver helper
* @param string $phpbb_root_path phpBB root path * @param string $phpbb_root_path phpBB root path
* @param string $php_ext PHP file extension * @param string $php_ext PHP file extension
*/ */
public function __construct($request, \phpbb\passwords\driver\salted_md5 $salted_md5, $phpbb_root_path, $php_ext) public function __construct($request, salted_md5 $salted_md5, helper $helper, $phpbb_root_path, $php_ext)
{ {
$this->request = $request; $this->request = $request;
$this->salted_md5 = $salted_md5; $this->salted_md5 = $salted_md5;
$this->helper = $helper;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $this->php_ext = $php_ext;
} }
@ -105,7 +110,7 @@ class md5_phpbb2 extends base
include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->php_ext); include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->php_ext);
} }
if (md5($password_old_format) === $hash || md5(\utf8_to_cp1252($password_old_format)) === $hash if ($this->helper->string_compare(md5($password_old_format), $hash) || $this->helper->string_compare(md5(\utf8_to_cp1252($password_old_format)), $hash)
|| $this->salted_md5->check(md5($password_old_format), $hash) === true || $this->salted_md5->check(md5($password_old_format), $hash) === true
|| $this->salted_md5->check(md5(\utf8_to_cp1252($password_old_format)), $hash) === true) || $this->salted_md5->check(md5(\utf8_to_cp1252($password_old_format)), $hash) === true)
{ {

2
phpBB/phpbb/passwords/driver/md5_vb.php
View file

@ -54,7 +54,7 @@ class md5_vb extends base
else else
{ {
// Works for vB 3.8.x, 4.x.x, 5.0.x // Works for vB 3.8.x, 4.x.x, 5.0.x
return $hash === md5(md5($password) . $user_row['user_passwd_salt']); return $this->helper->string_compare($hash, md5(md5($password) . $user_row['user_passwd_salt']));
} }
} }
} }

2
phpBB/phpbb/passwords/driver/salted_md5.php
View file

@ -107,7 +107,7 @@ class salted_md5 extends base
return md5($password) === $hash; return md5($password) === $hash;
} }
return $hash === $this->hash($password, $hash); return $this->helper->string_compare($hash, $this->hash($password, $hash));
} }
/** /**

2
phpBB/phpbb/passwords/driver/sha1.php
View file

@ -47,6 +47,6 @@ class sha1 extends base
*/ */
public function check($password, $hash, $user_row = array()) public function check($password, $hash, $user_row = array())
{ {
return (strlen($hash) == 40) ? $hash === sha1($password) : false; return (strlen($hash) == 40) ? $this->helper->string_compare($hash, sha1($password)) : false;
} }
} }

2
phpBB/phpbb/passwords/driver/sha1_smf.php
View file

@ -46,6 +46,6 @@ class sha1_smf extends base
*/ */
public function check($password, $hash, $user_row = array()) public function check($password, $hash, $user_row = array())
{ {
return (strlen($hash) == 40) ? $hash === $this->hash($password, $user_row) : false; return (strlen($hash) == 40) ? $this->helper->string_compare($hash, $this->hash($password, $user_row)) : false;
} }
} }

2
phpBB/phpbb/passwords/driver/sha1_wcf1.php
View file

@ -54,7 +54,7 @@ class sha1_wcf1 extends base
else else
{ {
// Works for standard WCF 1.x, i.e. WBB3 and similar // Works for standard WCF 1.x, i.e. WBB3 and similar
return $hash === sha1($user_row['user_passwd_salt'] . sha1($user_row['user_passwd_salt'] . sha1($password))); return $this->helper->string_compare($hash, sha1($user_row['user_passwd_salt'] . sha1($user_row['user_passwd_salt'] . sha1($password))));
} }
} }
} }

4
phpBB/phpbb/passwords/driver/sha_xf1.php
View file

@ -54,8 +54,8 @@ class sha_xf1 extends base
else else
{ {
// Works for xenforo 1.0, 1.1 // Works for xenforo 1.0, 1.1
if ($hash === sha1(sha1($password) . $user_row['user_passwd_salt']) if ($this->helper->string_compare($hash, sha1(sha1($password) . $user_row['user_passwd_salt']))
|| $hash === hash('sha256', hash('sha256', $password) . $user_row['user_passwd_salt'])) || $this->helper->string_compare($hash, hash('sha256', hash('sha256', $password) . $user_row['user_passwd_salt'])))
{ {
return true; return true;
} }

2
tests/passwords/drivers_test.php
View file

@ -35,7 +35,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
'passwords.driver.md5_vb' => new \phpbb\passwords\driver\md5_vb($config, $this->driver_helper), 'passwords.driver.md5_vb' => new \phpbb\passwords\driver\md5_vb($config, $this->driver_helper),
'passwords.driver.sha_xf1' => new \phpbb\passwords\driver\sha_xf1($config, $this->driver_helper), 'passwords.driver.sha_xf1' => new \phpbb\passwords\driver\sha_xf1($config, $this->driver_helper),
); );
$this->passwords_drivers['passwords.driver.md5_phpbb2'] = new \phpbb\passwords\driver\md5_phpbb2($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext); $this->passwords_drivers['passwords.driver.md5_phpbb2'] = new \phpbb\passwords\driver\md5_phpbb2($request, $this->passwords_drivers['passwords.driver.salted_md5'], $this->driver_helper, $phpbb_root_path, $php_ext);
$this->passwords_drivers['passwords.driver.bcrypt_wcf2'] = new \phpbb\passwords\driver\bcrypt_wcf2($this->passwords_drivers['passwords.driver.bcrypt'], $this->driver_helper); $this->passwords_drivers['passwords.driver.bcrypt_wcf2'] = new \phpbb\passwords\driver\bcrypt_wcf2($this->passwords_drivers['passwords.driver.bcrypt'], $this->driver_helper);
} }