mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 08:01:10 +02:00
Code Issues Releases Wiki Activity

[feature/passwords] Add tests for combined hashing of passwords

Browse Source 
PHPBB3-11610
This commit is contained in:
Marc Alexander
2013-06-27 14:29:23 +02:00
parent dc76146cef
commit 6f33ca85a2
1 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/crypto/manager_test.php
View File

@ -110,8 +110,8 @@ class phpbb_crypto_manager_test extends PHPUnit_Framework_TestCase
$test_word = $password; $test_word = $password;
$time = microtime(true); $time = microtime(true);
// Limit each test to 3 seconds // Limit each test to 1 second
while ((microtime(true) - $time) < 3) while ((microtime(true) - $time) < 1)
{ {
$this->assertEquals($test_word === $password, $this->manager->check_hash($test_word, $hash)); $this->assertEquals($test_word === $password, $this->manager->check_hash($test_word, $hash));
$test_word = str_shuffle($test_word); $test_word = str_shuffle($test_word);
@ -125,4 +125,41 @@ class phpbb_crypto_manager_test extends PHPUnit_Framework_TestCase
$this->assertEquals(false, $driver->hash('foobar', 'foobar')); $this->assertEquals(false, $driver->hash('foobar', 'foobar'));
} }
} }
public function test_combined_hash_data()
{
return array(
array(
'crypto.driver.salted_md5',
array('crypto.driver.bcrypt_2y', 'crypto.driver.bcrypt'),
),
array(
'crypto.driver.salted_md5',
array('crypto.driver.bcrypt'),
),
array(
'crypto.driver.phpass',
array('crypto.driver.salted_md5'),
),
);
}
/**
* @dataProvider test_combined_hash_data
*/
public function test_combined_hash_password($first_type, $second_type)
{
$password = 'foobar';
$test_word = $password;
$hash = $this->manager->hash_password($password, $first_type);
$combined_hash = $this->manager->hash_password($hash, $second_type);
$time = microtime(true);
// Limit each test to 1 second
while ((microtime(true) - $time) < 1)
{
$this->assertEquals(($test_word === $password), $this->manager->check_hash($test_word, $combined_hash));
$test_word = str_shuffle($test_word);
}
}
} }