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

[feature/passwords] Do not use specific errors but just return false

Browse source 
The authentication system should handle the possible errors for now.
Additional error returns can be added later on if they are needed.

PHPBB3-11610
This commit is contained in:
Marc Alexander 2013-07-06 00:00:47 +02:00
parent dbd6d33e9f
commit a4b0a8ceb9
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/includes/crypto/manager.php
View file

@ -101,17 +101,18 @@ class phpbb_crypto_manager
* @param string $hash Password hash that should be checked
*
* @return object The hash type object
*
* @throws RunTimeException If hash type is not supported
*/
public function get_hashing_algorithm($hash)
{
// preg_match() will also show hashing algos like $2a\H$, which
// is a combination of bcrypt and phpass
/*
* preg_match() will also show hashing algos like $2a\H$, which
* is a combination of bcrypt and phpass. Legacy algorithms
* like md5 will not be matched by this and need to be treated
* differently.
*/
if (!preg_match('#^\$([a-zA-Z0-9\\\]*?)\$#', $hash, $match))
{
// Legacy support needed
throw new RunTimeException('NO_LEGACY_SUPPORT');
return false;
}
// Be on the lookout for multiple hashing algorithms
@ -124,15 +125,17 @@ class phpbb_crypto_manager
{
if (isset($this->type_map["\${$type}\$"]))
{
while(isset($return_ary[$type]))
// we do not support the same hashing
// algorithm more than once
if (isset($return_ary[$type]))
{
$type = $type + ' ';
return false;
}
$return_ary[$type] = $this->type_map["\${$type}\$"];
}
else
{
throw new \RunTimeException('HASH_TYPE_NOT_SUPPORTED');
return false;
}
}
return $return_ary;
@ -143,7 +146,7 @@ class phpbb_crypto_manager
}
else
{
throw new RunTimeException('UNKNOWN_HASH_TYPE');
return false;
}
}
@ -155,8 +158,6 @@ class phpbb_crypto_manager
* none is supplied
* @return string|bool Password hash of supplied password or false if
* if something went wrong during hashing
*
* @throws RunTimeException If hash type is not supported
*/
public function hash_password($password, $type = '')
{