Merge branch 'develop-ascraeus' into develop

* develop-ascraeus: (33 commits) [ticket/12352] Do not check hashes that don't have the necessary length [ticket/12352] Update file headers to fit new format [ticket/12352] Use custom provider collection for auth providers [ticket/12352] Add checks for existing user_pass_convert to migrations [ticket/12352] Remove usages of user_pass_convert column [ticket/12352] Update schema json file [ticket/12352] Remove user_pass_convert column from database [ticket/12352] Check each newly added passwords driver in manager_test [ticket/12352] Add get_settings_only method to passwords driver base [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords [ticket/12352] Add tests for wcf1 and wcf2 drivers [ticket/12352] Add driver for woltlab community framework 1 passwords [ticket/12352] Add driver for woltlab community framework 2 passwords [ticket/12352] Add missing $ to md5_mybb and md5_vb driver [ticket/12352] Fix spacing in passwords tests [ticket/12352] Add passwords driver for vB passwords [ticket/12352] Use correct hashing method in md5_mybb driver [ticket/12352] Add driver for myBB md5 passwords [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers [ticket/12352] Add passwords driver for sha1 password hashes ...
2025-07-30 21:40:43 +02:00 · 2014-06-11 14:28:06 +02:00
parent ee39a45664 694f8391c9
commit 86b5a815ab
35 changed files with 1335 additions and 113 deletions
--- a/tests/auth/fixtures/user.xml
+++ b/tests/auth/fixtures/user.xml
@@ -6,7 +6,6 @@
 		<column>username_clean</column>
 		<column>user_password</column>
 		<column>user_passchg</column>
-		<column>user_pass_convert</column>
 		<column>user_email</column>
 		<column>user_type</column>
 		<column>user_login_attempts</column>
@@ -18,7 +17,6 @@
 			<value>foobar</value>
 			<value>$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i</value>
 			<value>0</value>
-			<value>0</value>
 			<value>example@example.com</value>
 			<value>0</value>
 			<value>0</value>
@@ -31,7 +29,6 @@
 			<value>foobar2</value>
 			<value>$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/</value>
 			<value>0</value>
-			<value>0</value>
 			<value>example@example.com</value>
 			<value>0</value>
 			<value>0</value>
--- a/tests/auth/fixtures/user_533.xml
+++ b/tests/auth/fixtures/user_533.xml
@@ -6,7 +6,6 @@
 		<column>username_clean</column>
 		<column>user_password</column>
 		<column>user_passchg</column>
-		<column>user_pass_convert</column>
 		<column>user_email</column>
 		<column>user_type</column>
 		<column>user_login_attempts</column>
@@ -18,7 +17,6 @@
 			<value>foobar</value>
 			<value>$2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi</value>
 			<value>0</value>
-			<value>0</value>
 			<value>example@example.com</value>
 			<value>0</value>
 			<value>0</value>
@@ -31,7 +29,6 @@
 			<value>foobar2</value>
 			<value>$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/</value>
 			<value>0</value>
-			<value>0</value>
 			<value>example@example.com</value>
 			<value>0</value>
 			<value>0</value>
--- a/tests/auth/provider_apache_test.php
+++ b/tests/auth/provider_apache_test.php
@@ -148,7 +148,6 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 			'username_clean' => 'foobar',
 			'user_password' => $this->password_hash,
 			'user_passchg' => '0',
-			'user_pass_convert' => '0',
 			'user_email' => 'example@example.com',
 			'user_email_hash' => '0',
 			'user_birthday' => '',
--- a/tests/auth/provider_db_test.php
+++ b/tests/auth/provider_db_test.php
@@ -70,7 +70,6 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
 				'username' 				=> 'foobar',
 				'user_password'			=> $password_hash,
 				'user_passchg' 			=> '0',
-				'user_pass_convert' 	=> '0',
 				'user_email' 			=> 'example@example.com',
 				'user_type' 			=> '0',
 				'user_login_attempts' 	=> '0',
--- a/tests/mock/request.php
+++ b/tests/mock/request.php
@@ -15,6 +15,8 @@ class phpbb_mock_request implements \phpbb\request\request_interface
 {
 	protected $data;

+	protected $super_globals_disabled = false;
+
 	public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false, $files = array())
 	{
 		$this->data[\phpbb\request\request_interface::GET] = $get;
@@ -23,6 +25,8 @@ class phpbb_mock_request implements \phpbb\request\request_interface
 		$this->data[\phpbb\request\request_interface::REQUEST] = ($request === false) ? $post + $get : $request;
 		$this->data[\phpbb\request\request_interface::SERVER] = $server;
 		$this->data[\phpbb\request\request_interface::FILES] = $files;
+
+		$this->disable_super_globals();
 	}

 	public function overwrite($var_name, $value, $super_global = \phpbb\request\request_interface::REQUEST)
@@ -83,6 +87,21 @@ class phpbb_mock_request implements \phpbb\request\request_interface
 		return $this->data[$super_global];
 	}

+	public function super_globals_disabled()
+	{
+		return $this->super_globals_disabled;
+	}
+
+	public function disable_super_globals()
+	{
+		$this->super_globals_disabled = true;
+	}
+
+	public function enable_super_globals()
+	{
+		$this->super_globals_disabled = false;
+	}
+
 	/* custom methods */

 	public function set_header($header_name, $value)
--- a/tests/passwords/drivers_test.php
+++ b/tests/passwords/drivers_test.php
@@ -17,14 +17,26 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 	{
 		// Prepare dependencies for drivers
 		$config =  new \phpbb\config\config(array());
+		$request = new phpbb_mock_request(array(), array(), array(), array(), array('password' => 'fööbar'));
 		$this->driver_helper = new \phpbb\passwords\driver\helper($config);
+		$phpbb_root_path = dirname(__FILE__) . '/../../phpBB/';
+		$php_ext = 'php';

 		$this->passwords_drivers = array(
 			'passwords.driver.bcrypt_2y'	=> new \phpbb\passwords\driver\bcrypt_2y($config, $this->driver_helper),
-			'passwords.driver.bcrypt'		=> new \phpbb\passwords\driver\bcrypt($config, $this->driver_helper),
+			'passwords.driver.bcrypt'	=> new \phpbb\passwords\driver\bcrypt($config, $this->driver_helper),
 			'passwords.driver.salted_md5'	=> new \phpbb\passwords\driver\salted_md5($config, $this->driver_helper),
-			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $this->driver_helper),
+			'passwords.driver.phpass'	=> new \phpbb\passwords\driver\phpass($config, $this->driver_helper),
+			'passwords.driver.sha1_smf'	=> new \phpbb\passwords\driver\sha1_smf($config, $this->driver_helper),
+			'passwords.driver.sha1_wcf1'	=> new \phpbb\passwords\driver\sha1_wcf1($config, $this->driver_helper),
+			'passwords.driver.convert_password'=> new \phpbb\passwords\driver\convert_password($config, $this->driver_helper),
+			'passwords.driver.sha1'		=> new \phpbb\passwords\driver\sha1($config, $this->driver_helper),
+			'passwords.driver.md5_mybb'	=> new \phpbb\passwords\driver\md5_mybb($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),
 		);
+		$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.bcrypt_wcf2'] = new \phpbb\passwords\driver\bcrypt_wcf2($this->passwords_drivers['passwords.driver.bcrypt'], $this->driver_helper);
 	}

 	public function data_helper_encode64()
@@ -82,4 +94,323 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 		);
 		$this->assertEquals(false, $this->passwords_drivers['passwords.driver.salted_md5']->get_hash_settings(false));
 	}
+
+	public function data_hash_sha1_smf()
+	{
+		return array(
+			array(false, 'test', array()),
+			array(false, 'test', ''),
+			array('6f9e2a1899e1f15708fd2e554103480eb53e8b57', 'foobar', array('login_name' => 'test')),
+		);
+	}
+
+	/**
+	* @dataProvider data_hash_sha1_smf
+	*/
+	public function test_hash_sha1_smf($expected, $password, $user_row)
+	{
+		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.sha1_smf']->hash($password, $user_row));
+	}
+
+	public function data_get_settings()
+	{
+		return array(
+			array(false, '6f9e2a1899e1f15708fd2e554103480eb53e8b57', 'passwords.driver.sha1_smf'),
+		);
+	}
+
+	/**
+	* @dataProvider data_get_settings
+	*/
+	public function test_get_settings_only($expected, $hash, $driver)
+	{
+		$this->assertSame($expected, $this->passwords_drivers[$driver]->get_settings_only($hash));
+	}
+
+	public function data_md5_phpbb2_check()
+	{
+		return array(
+			array(false, 'foobar', 'ae2fc75e20ee25d4520766788fbc96ae'),
+			array(false, 'foobar', 'ae2fc75e20ee25d4520766788fbc96aeddsf'),
+			array(false, 'fööbar', 'ae2fc75e20ee25d4520766788fbc96ae'),
+			array(true, 'fööbar', 'ae2fc75e20ee25d4520766788fbc96ae', utf8_decode('fööbar')),
+			array(true, 'fööbar', '$H$966CepJh9RC3hFIm7aKywR6jEn0kpA0', utf8_decode('fööbar')),
+			array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', $this->utf8_to_cp1252(utf8_decode('fööbar'))),
+			array(true, 'fööbar', '$H$9rNjgwETtmc8befO8JL1xFMrrMw8MC.', $this->utf8_to_cp1252('fööbar')),
+		);
+	}
+
+	/**
+	* @dataProvider data_md5_phpbb2_check
+	*/
+	public function test_md5_phpbb2_check($expected, $password, $hash, $request_password = false)
+	{
+		if (!$request_password)
+		{
+			unset($_REQUEST['password']);
+		}
+		else
+		{
+			$_REQUEST['password'] = $request_password;
+		}
+		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.md5_phpbb2']->check($password, $hash));
+	}
+
+	public function test_md5_phpbb2_hash()
+	{
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_phpbb2']->hash('foobar'));
+	}
+
+	public function test_convert_password_driver()
+	{
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.convert_password']->hash('foobar'));
+	}
+
+	public function test_sha1_driver()
+	{
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1']->hash('foobar'));
+	}
+
+	public function data_md5_mybb_check()
+	{
+		return array(
+			array(false, 'foobar', '083d11daea8675b1b4b502c7e55f8dbd'),
+			array(false, 'foobar', '083d11daea8675b1b4b502c7e55f8dbd', array('user_passwd_salt' => 'ae2fc75e')),
+			array(true, 'foobar', 'b86ee7e24008bfd2890dcfab1ed31333', array('user_passwd_salt' => 'yeOtfFO6')),
+		);
+	}
+
+	/**
+	* @dataProvider data_md5_mybb_check
+	*/
+	public function test_md5_mybb_check($expected, $password, $hash, $user_row = array())
+	{
+		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.md5_mybb']->check($password, $hash, $user_row));
+	}
+
+	public function test_md5_mybb_driver()
+	{
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_mybb']->hash('foobar'));
+	}
+
+	public function data_md5_vb_check()
+	{
+		return array(
+			array(false, 'foobar', '083d11daea8675b1b4b502c7e55f8dbd'),
+			array(false, 'foobar', 'b86ee7e24008bfd2890dcfab1ed31333', array('user_passwd_salt' => 'yeOtfFO6')),
+			array(true, 'foobar', 'b452c54c44c588fc095d2d000935c470', array('user_passwd_salt' => '9^F')),
+			array(true, 'foobar', 'f23a8241bd115d270c703213e3ef7f52', array('user_passwd_salt' => 'iaU*U%`CBl;/e~>D%do2m@Xf/,KZB0')),
+			array(false, 'nope', 'f23a8241bd115d270c703213e3ef7f52', array('user_passwd_salt' => 'iaU*U%`CBl;/e~>D%do2m@Xf/,KZB0')),
+		);
+	}
+
+	/**
+	* @dataProvider data_md5_vb_check
+	*/
+	public function test_md5_vb_check($expected, $password, $hash, $user_row = array())
+	{
+		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.md5_vb']->check($password, $hash, $user_row));
+	}
+
+	public function test_md5_vb_driver()
+	{
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_vb']->hash('foobar'));
+	}
+
+	public function data_sha1_wcf1_check()
+	{
+		return array(
+			array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'),
+			array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff', array('user_passwd_salt' => 'yeOtfFO6')),
+			array(true, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff', array('user_passwd_salt' => '1a783e478d63f6422783a868db667aed3a857840')),
+		);
+	}
+
+	/**
+	* @dataProvider data_sha1_wcf1_check
+	*/
+	public function test_sha1_wcf1_check($expected, $password, $hash, $user_row = array())
+	{
+		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.sha1_wcf1']->check($password, $hash, $user_row));
+	}
+
+	public function test_sha1_wcf1_driver()
+	{
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1_wcf1']->hash('foobar'));
+	}
+
+	public function data_bcrypt_wcf2_check()
+	{
+		return array(
+			array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'),
+			array(true, 'foobar', '$2a$08$p8h14U0jsEiVb1Luy.s8oOTXSQ0hVWUXpcNGBoCezeYNXrQyCKHfi'),
+			array(false, 'foobar', ''),
+		);
+	}
+
+	/**
+	* @dataProvider data_bcrypt_wcf2_check
+	*/
+	public function test_bcrypt_wcf2_check($expected, $password, $hash)
+	{
+		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.bcrypt_wcf2']->check($password, $hash));
+	}
+
+	public function test_bcrypt_wcf2_driver()
+	{
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.bcrypt_wcf2']->hash('foobar'));
+	}
+
+	public function data_sha_xf1_check()
+	{
+		return array(
+			array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff'),
+			array(false, 'foobar', 'fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff', array('user_passwd_salt' => 'yeOtfFO6')),
+			array(true, 'foobar', '7f65d2fa8a826d232f8134772252f8b1aaef8594b1edcabd9ab65e5b0f236ff0', array('user_passwd_salt' => '15b6c02cedbd727f563dcca607a89b085287b448966f19c0cc78cae263b1e38c')),
+			array(true, 'foobar', '69962ae2079420573a3948cc4dedbabd35680051', array('user_passwd_salt' => '15b6c02cedbd727f563dcca607a89b085287b448966f19c0cc78cae263b1e38c')),
+		);
+	}
+
+	/**
+	* @dataProvider data_sha_xf1_check
+	*/
+	public function test_sha_xf1_check($expected, $password, $hash, $user_row = array())
+	{
+		$this->assertSame($expected, $this->passwords_drivers['passwords.driver.sha_xf1']->check($password, $hash, $user_row));
+	}
+
+	public function test_sha_xf1_driver()
+	{
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha_xf1']->hash('foobar'));
+	}
+
+	protected function utf8_to_cp1252($string)
+	{
+		static $transform = array(
+			"\xE2\x82\xAC" => "\x80",
+			"\xE2\x80\x9A" => "\x82",
+			"\xC6\x92" => "\x83",
+			"\xE2\x80\x9E" => "\x84",
+			"\xE2\x80\xA6" => "\x85",
+			"\xE2\x80\xA0" => "\x86",
+			"\xE2\x80\xA1" => "\x87",
+			"\xCB\x86" => "\x88",
+			"\xE2\x80\xB0" => "\x89",
+			"\xC5\xA0" => "\x8A",
+			"\xE2\x80\xB9" => "\x8B",
+			"\xC5\x92" => "\x8C",
+			"\xC5\xBD" => "\x8E",
+			"\xE2\x80\x98" => "\x91",
+			"\xE2\x80\x99" => "\x92",
+			"\xE2\x80\x9C" => "\x93",
+			"\xE2\x80\x9D" => "\x94",
+			"\xE2\x80\xA2" => "\x95",
+			"\xE2\x80\x93" => "\x96",
+			"\xE2\x80\x94" => "\x97",
+			"\xCB\x9C" => "\x98",
+			"\xE2\x84\xA2" => "\x99",
+			"\xC5\xA1" => "\x9A",
+			"\xE2\x80\xBA" => "\x9B",
+			"\xC5\x93" => "\x9C",
+			"\xC5\xBE" => "\x9E",
+			"\xC5\xB8" => "\x9F",
+			"\xC2\xA0" => "\xA0",
+			"\xC2\xA1" => "\xA1",
+			"\xC2\xA2" => "\xA2",
+			"\xC2\xA3" => "\xA3",
+			"\xC2\xA4" => "\xA4",
+			"\xC2\xA5" => "\xA5",
+			"\xC2\xA6" => "\xA6",
+			"\xC2\xA7" => "\xA7",
+			"\xC2\xA8" => "\xA8",
+			"\xC2\xA9" => "\xA9",
+			"\xC2\xAA" => "\xAA",
+			"\xC2\xAB" => "\xAB",
+			"\xC2\xAC" => "\xAC",
+			"\xC2\xAD" => "\xAD",
+			"\xC2\xAE" => "\xAE",
+			"\xC2\xAF" => "\xAF",
+			"\xC2\xB0" => "\xB0",
+			"\xC2\xB1" => "\xB1",
+			"\xC2\xB2" => "\xB2",
+			"\xC2\xB3" => "\xB3",
+			"\xC2\xB4" => "\xB4",
+			"\xC2\xB5" => "\xB5",
+			"\xC2\xB6" => "\xB6",
+			"\xC2\xB7" => "\xB7",
+			"\xC2\xB8" => "\xB8",
+			"\xC2\xB9" => "\xB9",
+			"\xC2\xBA" => "\xBA",
+			"\xC2\xBB" => "\xBB",
+			"\xC2\xBC" => "\xBC",
+			"\xC2\xBD" => "\xBD",
+			"\xC2\xBE" => "\xBE",
+			"\xC2\xBF" => "\xBF",
+			"\xC3\x80" => "\xC0",
+			"\xC3\x81" => "\xC1",
+			"\xC3\x82" => "\xC2",
+			"\xC3\x83" => "\xC3",
+			"\xC3\x84" => "\xC4",
+			"\xC3\x85" => "\xC5",
+			"\xC3\x86" => "\xC6",
+			"\xC3\x87" => "\xC7",
+			"\xC3\x88" => "\xC8",
+			"\xC3\x89" => "\xC9",
+			"\xC3\x8A" => "\xCA",
+			"\xC3\x8B" => "\xCB",
+			"\xC3\x8C" => "\xCC",
+			"\xC3\x8D" => "\xCD",
+			"\xC3\x8E" => "\xCE",
+			"\xC3\x8F" => "\xCF",
+			"\xC3\x90" => "\xD0",
+			"\xC3\x91" => "\xD1",
+			"\xC3\x92" => "\xD2",
+			"\xC3\x93" => "\xD3",
+			"\xC3\x94" => "\xD4",
+			"\xC3\x95" => "\xD5",
+			"\xC3\x96" => "\xD6",
+			"\xC3\x97" => "\xD7",
+			"\xC3\x98" => "\xD8",
+			"\xC3\x99" => "\xD9",
+			"\xC3\x9A" => "\xDA",
+			"\xC3\x9B" => "\xDB",
+			"\xC3\x9C" => "\xDC",
+			"\xC3\x9D" => "\xDD",
+			"\xC3\x9E" => "\xDE",
+			"\xC3\x9F" => "\xDF",
+			"\xC3\xA0" => "\xE0",
+			"\xC3\xA1" => "\xE1",
+			"\xC3\xA2" => "\xE2",
+			"\xC3\xA3" => "\xE3",
+			"\xC3\xA4" => "\xE4",
+			"\xC3\xA5" => "\xE5",
+			"\xC3\xA6" => "\xE6",
+			"\xC3\xA7" => "\xE7",
+			"\xC3\xA8" => "\xE8",
+			"\xC3\xA9" => "\xE9",
+			"\xC3\xAA" => "\xEA",
+			"\xC3\xAB" => "\xEB",
+			"\xC3\xAC" => "\xEC",
+			"\xC3\xAD" => "\xED",
+			"\xC3\xAE" => "\xEE",
+			"\xC3\xAF" => "\xEF",
+			"\xC3\xB0" => "\xF0",
+			"\xC3\xB1" => "\xF1",
+			"\xC3\xB2" => "\xF2",
+			"\xC3\xB3" => "\xF3",
+			"\xC3\xB4" => "\xF4",
+			"\xC3\xB5" => "\xF5",
+			"\xC3\xB6" => "\xF6",
+			"\xC3\xB7" => "\xF7",
+			"\xC3\xB8" => "\xF8",
+			"\xC3\xB9" => "\xF9",
+			"\xC3\xBA" => "\xFA",
+			"\xC3\xBB" => "\xFB",
+			"\xC3\xBC" => "\xFC",
+			"\xC3\xBD" => "\xFD",
+			"\xC3\xBE" => "\xFE",
+			"\xC3\xBF" => "\xFF"
+		);
+		return strtr($string, $transform);
+	}
 }
--- a/tests/passwords/manager_test.php
+++ b/tests/passwords/manager_test.php
@@ -24,13 +24,25 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
 		// Prepare dependencies for manager and driver
 		$config =  new \phpbb\config\config(array());
 		$this->driver_helper = new \phpbb\passwords\driver\helper($config);
+		$request = new phpbb_mock_request(array(), array(), array(), array(), array('password' => 'töst'));
+		$phpbb_root_path = dirname(__FILE__) . '/../../phpBB/';
+		$php_ext = 'php';

 		$this->passwords_drivers = array(
-			'passwords.driver.bcrypt_2y'	=> new \phpbb\passwords\driver\bcrypt_2y($config, $this->driver_helper),
+			'passwords.driver.bcrypt_2y'		=> new \phpbb\passwords\driver\bcrypt_2y($config, $this->driver_helper),
 			'passwords.driver.bcrypt'		=> new \phpbb\passwords\driver\bcrypt($config, $this->driver_helper),
-			'passwords.driver.salted_md5'	=> new \phpbb\passwords\driver\salted_md5($config, $this->driver_helper),
+			'passwords.driver.salted_md5'		=> new \phpbb\passwords\driver\salted_md5($config, $this->driver_helper),
 			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $this->driver_helper),
+			'passwords.driver.convert_password'	=> new \phpbb\passwords\driver\convert_password($config, $this->driver_helper),
+			'passwords.driver.sha1_smf'		=> new \phpbb\passwords\driver\sha1_smf($config, $this->driver_helper),
+			'passwords.driver.sha1'			=> new \phpbb\passwords\driver\sha1($config, $this->driver_helper),
+			'passwords.driver.sha1_wcf1'		=> new \phpbb\passwords\driver\sha1_wcf1($config, $this->driver_helper),
+			'passwords.driver.md5_mybb'		=> new \phpbb\passwords\driver\md5_mybb($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),
 		);
+		$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.bcrypt_wcf2'] = new \phpbb\passwords\driver\bcrypt_wcf2($this->passwords_drivers['passwords.driver.bcrypt'], $this->driver_helper);

 		$this->helper = new \phpbb\passwords\helper;
 		// Set up passwords manager
@@ -132,21 +144,39 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
 	public function check_hash_exceptions_data()
 	{
 		return array(
-			array('foobar', '3858f62230ac3c915f300c664312c63f', true),
-			array('foobar', '$S$b57a939fa4f2c04413a4eea9734a0903647b7adb93181295', false),
-			array('foobar', '$2a\S$kkkkaakdkdiej39023903204j2k3490234jk234j02349', false),
-			array('foobar', '$H$kklk938d023k//k3023', false),
-			array('foobar', '$H$3PtYMgXb39lrIWkgoxYLWtRkZtY3AY/', false),
-			array('foobar', '$2a$kwiweorurlaeirw', false),
+			array('3858f62230ac3c915f300c664312c63f', true),
+			array('$CP$3858f62230ac3c915f300c664312c63f', true), // md5_phpbb2
+			array('$CP$3858f62230ac3c915f300c', false),
+			array('$S$b57a939fa4f2c04413a4eea9734a0903647b7adb93181295', false),
+			array('$2a\S$kkkkaakdkdiej39023903204j2k3490234jk234j02349', false),
+			array('$H$kklk938d023k//k3023', false),
+			array('$H$3PtYMgXb39lrIWkgoxYLWtRkZtY3AY/', false),
+			array('$2a$kwiweorurlaeirw', false),
+			array('6f9e2a1899e1f15708fd2e554103480eb53e8b57', false),
+			array('6f9e2a1899e1f15708fd2e554103480eb53e8b57', false, 'foobar', array('login_name' => 'test')),
+			array('$CP$6f9e2a1899e1f15708fd2e554103480eb53e8b57', true, 'foobar', array('login_name' => 'test')), // sha1_smf
+			array('6f9e2a1899', false, 'foobar', array('login_name' => 'test')),
+			array('ae2fc75e20ee25d4520766788fbc96ae', false, 'fööbar'),
+			array('$CP$ae2fc75e20ee25d4520766788fbc96ae', false, 'fööbar'),
+			array('$CP$ae2fc75e20ee25d4520766788fbc96ae', true, utf8_decode('fööbar')), // md5_phpbb2
+			array('b86ee7e24008bfd2890dcfab1ed31333', false, 'foobar', array('user_passwd_salt' => 'yeOtfFO6')),
+			array('$CP$b86ee7e24008bfd2890dcfab1ed31333', true, 'foobar', array('user_passwd_salt' => 'yeOtfFO6')), // md5_mybb
+			array('$CP$b452c54c44c588fc095d2d000935c470', true, 'foobar', array('user_passwd_salt' => '9^F')), // md5_vb
+			array('$CP$f23a8241bd115d270c703213e3ef7f52', true, 'foobar', array('user_passwd_salt' => 'iaU*U%`CBl;/e~>D%do2m@Xf/,KZB0')), // md5_vb
+			array('$CP$fc46b9d9386167ce365ea3b891bf5dc31ddcd3ff', true, 'foobar', array('user_passwd_salt' => '1a783e478d63f6422783a868db667aed3a857840')), // sha_wcf1
+			array('$2a$08$p8h14U0jsEiVb1Luy.s8oOTXSQ0hVWUXpcNGBoCezeYNXrQyCKHfi', false),
+			array('$CP$$2a$08$p8h14U0jsEiVb1Luy.s8oOTXSQ0hVWUXpcNGBoCezeYNXrQyCKHfi', true), // bcrypt_wcf2
+			array('$CP$7f65d2fa8a826d232f8134772252f8b1aaef8594b1edcabd9ab65e5b0f236ff0', true, 'foobar', array('user_passwd_salt' => '15b6c02cedbd727f563dcca607a89b085287b448966f19c0cc78cae263b1e38c')), // sha_xf1
+			array('$CP$69962ae2079420573a3948cc4dedbabd35680051', true, 'foobar', array('user_passwd_salt' => '15b6c02cedbd727f563dcca607a89b085287b448966f19c0cc78cae263b1e38c')), // sha_xf1
 		);
 	}

 	/**
 	* @dataProvider check_hash_exceptions_data
 	*/
-	public function test_check_hash_exceptions($password, $hash, $expected)
+	public function test_check_hash_exceptions($hash, $expected, $password = 'foobar', $user_row = array())
 	{
-		$this->assertEquals($expected, $this->manager->check($password, $hash));
+		$this->assertEquals($expected, $this->manager->check($password, $hash, $user_row));
 	}

 	public function data_hash_password_length()
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -96,6 +96,12 @@ class phpbb_session_testable_factory
 			'auth.provider.db',
 			new phpbb_mock_auth_provider()
 		);
+		$provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config);
+		$provider_collection->add('auth.provider.db');
+		$phpbb_container->set(
+			'auth.provider_collection',
+			$provider_collection
+		);

 		$session = new phpbb_mock_session_testable;
 		return $session;