diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-02 06:26:35 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-02 06:26:35 -0800 |
| commit | f8d6a07392f73bc7b85418a60047d761661a7657 (patch) | |
| tree | cfefda4a9dab1019c9e6fad96c8055cec5b03c9e /tests/test_framework/phpbb_functional_test_case.php | |
| parent | cb04252fbd17ac718c09ecc44dab4c7627a98b35 (diff) | |
| parent | b094c7999660703370566018bf449a9280148b8d (diff) | |
| download | forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.gz forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.bz2 forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.xz forums-f8d6a07392f73bc7b85418a60047d761661a7657.zip | |
Merge pull request #1716 from marc1706/feature/passwords
[feature/passwords] Add password hashing manager with support for newer hashing algorithms
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index eba5a2dfdf..71d03746a9 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -503,6 +503,7 @@ class phpbb_functional_test_case extends phpbb_test_case set_config(null, null, null, $config); set_config_count(null, null, null, $config); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $passwords_manager = $this->get_passwords_manager(); $user_row = array( 'username' => $username, @@ -512,7 +513,7 @@ class phpbb_functional_test_case extends phpbb_test_case 'user_lang' => 'en', 'user_timezone' => 0, 'user_dateformat' => '', - 'user_password' => phpbb_hash($username . $username), + 'user_password' => $passwords_manager->hash($username . $username), ); return user_add($user_row); } @@ -997,4 +998,29 @@ class phpbb_functional_test_case extends phpbb_test_case } return null; } + + /** + * Return a passwords manager instance + * + * @return phpbb\passwords\manager + */ + public function get_passwords_manager() + { + // Prepare dependencies for manager and driver + $config = new \phpbb\config\config(array()); + $driver_helper = new \phpbb\passwords\driver\helper($config); + + $passwords_drivers = array( + 'passwords.driver.bcrypt_2y' => new \phpbb\passwords\driver\bcrypt_2y($config, $driver_helper), + 'passwords.driver.bcrypt' => new \phpbb\passwords\driver\bcrypt($config, $driver_helper), + 'passwords.driver.salted_md5' => new \phpbb\passwords\driver\salted_md5($config, $driver_helper), + 'passwords.driver.phpass' => new \phpbb\passwords\driver\phpass($config, $driver_helper), + ); + + $passwords_helper = new \phpbb\passwords\helper; + // Set up passwords manager + $manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers)); + + return $manager; + } } |