From c6e1b51d786857478d2c20050c01f92ac2f8ac76 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 29 May 2014 14:00:42 +0200
Subject: [ticket/12352] Add passwords driver for vB passwords

PHPBB3-12352
---
 phpBB/config/passwords.yml              |  8 ++++
 phpBB/phpbb/passwords/driver/md5_vb.php | 67 +++++++++++++++++++++++++++++++++
 tests/passwords/drivers_test.php        | 29 +++++++++++++-
 tests/passwords/manager_test.php        |  1 +
 4 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/phpbb/passwords/driver/md5_vb.php

diff --git a/phpBB/config/passwords.yml b/phpBB/config/passwords.yml
index 4b89d5d81a..52a1bd7e5a 100644
--- a/phpBB/config/passwords.yml
+++ b/phpBB/config/passwords.yml
@@ -80,6 +80,14 @@ services:
         tags:
             - { name: passwords.driver }
 
+    passwords.driver.md5_vb:
+        class: phpbb\passwords\driver\md5_vb
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
     passwords.driver_collection:
         class: phpbb\di\service_collection
         arguments:
diff --git a/phpBB/phpbb/passwords/driver/md5_vb.php b/phpBB/phpbb/passwords/driver/md5_vb.php
new file mode 100644
index 0000000000..9d87503266
--- /dev/null
+++ b/phpBB/phpbb/passwords/driver/md5_vb.php
@@ -0,0 +1,67 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\passwords\driver;
+
+/**
+* @package passwords
+*/
+class md5_vb extends base
+{
+	const PREFIX = '$md5_vb$';
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_prefix()
+	{
+		return self::PREFIX;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function is_legacy()
+	{
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function hash($password, $user_row = '')
+	{
+		// Do not support hashing
+		return false;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function check($password, $hash, $user_row = array())
+	{
+		if (empty(hash) || !isset($user_row['user_passwd_salt']))
+		{
+			return false;
+		}
+		else
+		{
+			// Works for vB 3.8.x, 4.x.x, 5.0.x
+			return $hash === md5(md5($password) . $user_row['user_passwd_salt']);
+		}
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_settings_only($hash, $full = false)
+	{
+		return false;
+	}
+}
diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php
index 146f979a27..d67aead75a 100644
--- a/tests/passwords/drivers_test.php
+++ b/tests/passwords/drivers_test.php
@@ -30,7 +30,8 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 			'passwords.driver.sha1_smf'	=> new \phpbb\passwords\driver\sha1_smf($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_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),
 		);
 		$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);
 	}
@@ -197,6 +198,32 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
 		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_mybb']->get_settings_only('6022de2cc0ecf59ff14b57c6205ee170'));
 	}
 
+	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'));
+
+		$this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_vb']->get_settings_only('6022de2cc0ecf59ff14b57c6205ee170'));
+	}
+
 	protected function utf8_to_cp1252($string)
 	{
 		static $transform = array(
diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php
index e2ec1972bb..959bc9a88c 100644
--- a/tests/passwords/manager_test.php
+++ b/tests/passwords/manager_test.php
@@ -37,6 +37,7 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
 			'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.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),
 		);
 		$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);
 
-- 
cgit v1.2.1