mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 08:17:47 +02:00
Code Issues Releases Wiki Activity

[ticket/12577] Lazy initialize the password manager

Browse Source 
PHPBB3-12577
This commit is contained in:
Tristan Darricau
2015-09-17 15:36:04 +02:00
parent 087e219a09
commit 25f5e4f18f
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/phpbb/passwords/manager.php
View File

@@ -49,6 +49,10 @@ class manager
*/
protected $config;
private $initialized = false;
private $hashing_algorithms;
private $defaults;
/**
* Construct a passwords object
*
@@ -62,9 +66,18 @@ class manager
{
$this->config = $config;
$this->helper = $helper;
$this->hashing_algorithms = $hashing_algorithms;
$this->defaults = $defaults;
}
$this->fill_type_map($hashing_algorithms);
$this->register_default_type($defaults);
protected function initialize()
{
if (!$this->initialized)
{
$this->initialized = true;
$this->fill_type_map($this->hashing_algorithms);
$this->register_default_type($this->defaults);
}
}
/**
@@ -144,6 +157,8 @@ class manager
return false;
}
$this->initialize();
// Be on the lookout for multiple hashing algorithms
// 2 is correct: H\2a > 2, H\P > 2
if (strlen($match[1]) > 2)
@@ -192,6 +207,8 @@ class manager
return false;
}
$this->initialize();
// Try to retrieve algorithm by service name if type doesn't
// start with dollar sign
if (!is_array($type) && strpos($type, '$') !== 0 && isset($this->algorithms[$type]))
@@ -242,6 +259,8 @@ class manager
return false;
}
$this->initialize();
// First find out what kind of hash we're dealing with
$stored_hash_type = $this->detect_algorithm($hash);
if ($stored_hash_type == false)
@@ -297,6 +316,8 @@ class manager
*/
public function combined_hash_password($password_hash, $type)
{
$this->initialize();
$data = array(
'prefix' => '$',
'settings' => '$',