From fcaae9b0474035b9869f7e80c82242293edcfc27 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 30 May 2014 17:39:04 +0200
Subject: [ticket/12352] Check each newly added passwords driver in
 manager_test

PHPBB3-12352
---
 tests/passwords/manager_test.php | 41 ++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

(limited to 'tests/passwords')

diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php
index 714b9d8ebf..e46cf820f2 100644
--- a/tests/passwords/manager_test.php
+++ b/tests/passwords/manager_test.php
@@ -144,28 +144,37 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
 	public function check_hash_exceptions_data()
 	{
 		return array(
-			array('foobar', '3858f62230ac3c915f300c664312c63f', true),
-			array('foobar', '$CP$3858f62230ac3c915f300c664312c63f', true),
-			array('foobar', '$CP$3858f62230ac3c915f300c', false),
-			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('foobar', '6f9e2a1899e1f15708fd2e554103480eb53e8b57', false),
-			array('foobar', '6f9e2a1899e1f15708fd2e554103480eb53e8b57', false, array('login_name' => 'test')),
-			array('foobar', '$CP$6f9e2a1899e1f15708fd2e554103480eb53e8b57', true, array('login_name' => 'test')),
-			array('foobar', '6f9e2a1899', false, array('login_name' => 'test')),
-			array('fööbar', 'ae2fc75e20ee25d4520766788fbc96ae', false),
-			array('fööbar', '$CP$ae2fc75e20ee25d4520766788fbc96ae', false),
-			array(utf8_decode('fööbar'), '$CP$ae2fc75e20ee25d4520766788fbc96ae', true),
+			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, $user_row = array())
+	public function test_check_hash_exceptions($hash, $expected, $password = 'foobar', $user_row = array())
 	{
 		$this->assertEquals($expected, $this->manager->check($password, $hash, $user_row));
 	}
-- 
cgit v1.2.1