diff options
Diffstat (limited to 'phpBB')
25 files changed, 1252 insertions, 71 deletions
diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml index e1c289334e..43648b4ad3 100644 --- a/phpBB/config/auth_providers.yml +++ b/phpBB/config/auth_providers.yml @@ -10,6 +10,7 @@ services:          arguments:              - @dbal.conn              - @config +            - @passwords.manager              - @request              - @user              - %core.root_path% @@ -21,6 +22,7 @@ services:          arguments:              - @dbal.conn              - @config +            - @passwords.manager              - @request              - @user              - %core.root_path% @@ -32,6 +34,7 @@ services:          arguments:              - @dbal.conn              - @config +            - @passwords.manager              - @user          tags:              - { name: auth.provider } diff --git a/phpBB/config/passwords.yml b/phpBB/config/passwords.yml new file mode 100644 index 0000000000..511f10c31c --- /dev/null +++ b/phpBB/config/passwords.yml @@ -0,0 +1,66 @@ +parameters: +    passwords.algorithm: passwords.driver.bcrypt_2y + +services: +    passwords.driver.bcrypt: +        class: phpbb\passwords\driver\bcrypt +        arguments: +            - @config +            - @passwords.driver_helper +        calls: +            - [set_name, [passwords.driver.bcrypt]] +        tags: +            - { name: passwords.driver } + +    passwords.driver.bcrypt_2y: +        class: phpbb\passwords\driver\bcrypt_2y +        arguments: +            - @config +            - @passwords.driver_helper +        calls: +            - [set_name, [passwords.driver.bcrypt_2y]] +        tags: +            - { name: passwords.driver } + +    passwords.driver.salted_md5: +        class: phpbb\passwords\driver\salted_md5 +        arguments: +            - @config +            - @passwords.driver_helper +        calls: +            - [set_name, [passwords.driver.salted_md5]] +        tags: +            - { name: passwords.driver } + +    passwords.driver.phpass: +        class: phpbb\passwords\driver\phpass +        arguments: +            - @config +            - @passwords.driver_helper +        calls: +            - [set_name, [passwords.driver.phpass]] +        tags: +            - { name: passwords.driver } + +    passwords.driver_collection: +        class: phpbb\di\service_collection +        arguments: +            - @service_container +        tags: +            - { name: service_collection, tag: passwords.driver } + +    passwords.driver_helper: +        class: phpbb\passwords\driver\helper +        arguments: +            - @config + +    passwords.manager: +        class: phpbb\passwords\manager +        arguments: +            - @config +            - @passwords.driver_collection +            - @passwords.helper +            - %passwords.algorithm% + +    passwords.helper: +        class: phpbb\passwords\helper diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 51ae5c454d..1af0457331 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -6,6 +6,7 @@ imports:      - { resource: avatars.yml }      - { resource: feed.yml }      - { resource: auth_providers.yml } +    - { resource: passwords.yml }  services:      acl.permissions: diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php index 69d39e0f8c..40f4ac34ab 100644 --- a/phpBB/includes/db/schema_data.php +++ b/phpBB/includes/db/schema_data.php @@ -1112,7 +1112,7 @@ $schema_data['phpbb_users'] = array(  		'user_regdate'				=> array('TIMESTAMP', 0),  		'username'					=> array('VCHAR_CI', ''),  		'username_clean'			=> array('VCHAR_CI', ''), -		'user_password'				=> array('VCHAR_UNI:40', ''), +		'user_password'				=> array('VCHAR_CI', ''),  		'user_passchg'				=> array('TIMESTAMP', 0),  		'user_pass_convert'			=> array('BOOL', 0),  		'user_email'				=> array('VCHAR_UNI:100', ''), diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e1f96c0b1e..953c0a3b1c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -398,38 +398,10 @@ function still_on_time($extra_time = 15)  */  function phpbb_hash($password)  { -	$itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; +	global $phpbb_container; -	$random_state = unique_id(); -	$random = ''; -	$count = 6; - -	if (($fh = @fopen('/dev/urandom', 'rb'))) -	{ -		$random = fread($fh, $count); -		fclose($fh); -	} - -	if (strlen($random) < $count) -	{ -		$random = ''; - -		for ($i = 0; $i < $count; $i += 16) -		{ -			$random_state = md5(unique_id() . $random_state); -			$random .= pack('H*', md5($random_state)); -		} -		$random = substr($random, 0, $count); -	} - -	$hash = _hash_crypt_private($password, _hash_gensalt_private($random, $itoa64), $itoa64); - -	if (strlen($hash) == 34) -	{ -		return $hash; -	} - -	return md5($password); +	$passwords_manager = $phpbb_container->get('passwords.manager'); +	return $passwords_manager->hash($password);  }  /** @@ -442,20 +414,10 @@ function phpbb_hash($password)  */  function phpbb_check_hash($password, $hash)  { -	if (strlen($password) > 4096) -	{ -		// If the password is too huge, we will simply reject it -		// and not let the server try to hash it. -		return false; -	} - -	$itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; -	if (strlen($hash) == 34) -	{ -		return (_hash_crypt_private($password, $hash, $itoa64) === $hash) ? true : false; -	} +	global $phpbb_container; -	return (md5($password) === $hash) ? true : false; +	$passwords_manager = $phpbb_container->get('passwords.manager'); +	return $passwords_manager->check($password, $hash);  }  /** diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 1e47008d73..a9b7f58099 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -1365,7 +1365,7 @@ CREATE TABLE phpbb_users (  	user_regdate INTEGER DEFAULT 0 NOT NULL,  	username VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,  	username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, -	user_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, +	user_password VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,  	user_passchg INTEGER DEFAULT 0 NOT NULL,  	user_pass_convert INTEGER DEFAULT 0 NOT NULL,  	user_email VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 922313236e..bea116b7d6 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -1681,7 +1681,7 @@ CREATE TABLE [phpbb_users] (  	[user_regdate] [int] DEFAULT (0) NOT NULL ,  	[username] [varchar] (255) DEFAULT ('') NOT NULL ,  	[username_clean] [varchar] (255) DEFAULT ('') NOT NULL , -	[user_password] [varchar] (40) DEFAULT ('') NOT NULL , +	[user_password] [varchar] (255) DEFAULT ('') NOT NULL ,  	[user_passchg] [int] DEFAULT (0) NOT NULL ,  	[user_pass_convert] [int] DEFAULT (0) NOT NULL ,  	[user_email] [varchar] (100) DEFAULT ('') NOT NULL , diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index e07a768387..da464f3ae7 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -974,7 +974,7 @@ CREATE TABLE phpbb_users (  	user_regdate int(11) UNSIGNED DEFAULT '0' NOT NULL,  	username blob NOT NULL,  	username_clean blob NOT NULL, -	user_password varbinary(120) DEFAULT '' NOT NULL, +	user_password blob DEFAULT '' NOT NULL,  	user_passchg int(11) UNSIGNED DEFAULT '0' NOT NULL,  	user_pass_convert tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,  	user_email blob NOT NULL, diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index d3ed1ee15e..fa8929d860 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -974,7 +974,7 @@ CREATE TABLE phpbb_users (  	user_regdate int(11) UNSIGNED DEFAULT '0' NOT NULL,  	username varchar(255) DEFAULT '' NOT NULL,  	username_clean varchar(255) DEFAULT '' NOT NULL, -	user_password varchar(40) DEFAULT '' NOT NULL, +	user_password varchar(255) DEFAULT '' NOT NULL,  	user_passchg int(11) UNSIGNED DEFAULT '0' NOT NULL,  	user_pass_convert tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,  	user_email varchar(100) DEFAULT '' NOT NULL, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index f32980e378..a2e9780b9f 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -986,7 +986,7 @@ CREATE TABLE phpbb_poll_votes (  	topic_id number(8) DEFAULT '0' NOT NULL,  	poll_option_id number(4) DEFAULT '0' NOT NULL,  	vote_user_id number(8) DEFAULT '0' NOT NULL, -	vote_user_ip varchar2(40) DEFAULT ''  +	vote_user_ip varchar2(40) DEFAULT ''  )  / @@ -1798,7 +1798,7 @@ CREATE TABLE phpbb_users (  	user_regdate number(11) DEFAULT '0' NOT NULL,  	username varchar2(255) DEFAULT '' ,  	username_clean varchar2(255) DEFAULT '' , -	user_password varchar2(120) DEFAULT '' , +	user_password varchar2(255) DEFAULT '' ,  	user_passchg number(11) DEFAULT '0' NOT NULL,  	user_pass_convert number(1) DEFAULT '0' NOT NULL,  	user_email varchar2(300) DEFAULT '' , diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 14435898eb..ecafe8f43f 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -1246,7 +1246,7 @@ CREATE TABLE phpbb_users (  	user_regdate INT4 DEFAULT '0' NOT NULL CHECK (user_regdate >= 0),  	username varchar_ci DEFAULT '' NOT NULL,  	username_clean varchar_ci DEFAULT '' NOT NULL, -	user_password varchar(40) DEFAULT '' NOT NULL, +	user_password varchar_ci DEFAULT '' NOT NULL,  	user_passchg INT4 DEFAULT '0' NOT NULL CHECK (user_passchg >= 0),  	user_pass_convert INT2 DEFAULT '0' NOT NULL CHECK (user_pass_convert >= 0),  	user_email varchar(100) DEFAULT '' NOT NULL, diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index de88900f06..d076b9823b 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -945,7 +945,7 @@ CREATE TABLE phpbb_users (  	user_regdate INTEGER UNSIGNED NOT NULL DEFAULT '0',  	username varchar(255) NOT NULL DEFAULT '',  	username_clean varchar(255) NOT NULL DEFAULT '', -	user_password varchar(40) NOT NULL DEFAULT '', +	user_password varchar(255) NOT NULL DEFAULT '',  	user_passchg INTEGER UNSIGNED NOT NULL DEFAULT '0',  	user_pass_convert INTEGER UNSIGNED NOT NULL DEFAULT '0',  	user_email varchar(100) NOT NULL DEFAULT '', diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php index 5cbb63c4fc..f111672a23 100644 --- a/phpBB/phpbb/auth/provider/apache.php +++ b/phpBB/phpbb/auth/provider/apache.php @@ -25,19 +25,28 @@ if (!defined('IN_PHPBB'))  class apache extends \phpbb\auth\provider\base  {  	/** +	* phpBB passwords manager +	* +	* @var \phpbb\passwords\manager +	*/ +	protected $passwords_manager; + +	/**  	 * Apache Authentication Constructor  	 *  	 * @param 	\phpbb\db\driver\driver 	$db  	 * @param 	\phpbb\config\config 		$config +	  * @param	\phpbb\passwords\manager	$passwords_manager  	 * @param 	\phpbb\request\request 		$request  	 * @param 	\phpbb\user 			$user  	 * @param 	string 				$phpbb_root_path  	 * @param 	string 				$php_ext  	 */ -	public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext) +	public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext)  	{  		$this->db = $db;  		$this->config = $config; +		$this->passwords_manager = $passwords_manager;  		$this->request = $request;  		$this->user = $user;  		$this->phpbb_root_path = $phpbb_root_path; @@ -228,7 +237,7 @@ class apache extends \phpbb\auth\provider\base  		// generate user account data  		return array(  			'username'		=> $username, -			'user_password'	=> phpbb_hash($password), +			'user_password'	=> $this->passwords_manager->hash($password),  			'user_email'	=> '',  			'group_id'		=> (int) $row['group_id'],  			'user_type'		=> USER_NORMAL, diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 4654e49fb5..de07a84cf5 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -26,21 +26,29 @@ if (!defined('IN_PHPBB'))   */  class db extends \phpbb\auth\provider\base  { +	/** +	* phpBB passwords manager +	* +	* @var \phpbb\passwords\manager +	*/ +	protected $passwords_manager;  	/**  	 * Database Authentication Constructor  	 * -	 * @param	\phpbb\db\driver\driver	$db -	 * @param	\phpbb\config\config 	$config -	 * @param	\phpbb\request\request	$request -	 * @param	\phpbb\user		$user -	 * @param	string			$phpbb_root_path -	 * @param	string			$php_ext +	 * @param	\phpbb\db\driver\driver		$db +	 * @param	\phpbb\config\config 		$config +	 * @param	\phpbb\passwords\manager	$passwords_manager +	 * @param	\phpbb\request\request		$request +	 * @param	\phpbb\user			$user +	 * @param	string				$phpbb_root_path +	 * @param	string				$php_ext  	 */ -	public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext) +	public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext)  	{  		$this->db = $db;  		$this->config = $config; +		$this->passwords_manager = $passwords_manager;  		$this->request = $request;  		$this->user = $user;  		$this->phpbb_root_path = $phpbb_root_path; @@ -199,10 +207,10 @@ class db extends \phpbb\auth\provider\base  				// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding  				// plain md5 support left in for conversions from other systems. -				if ((strlen($row['user_password']) == 34 && (phpbb_check_hash(md5($password_old_format), $row['user_password']) || phpbb_check_hash(md5(utf8_to_cp1252($password_old_format)), $row['user_password']))) +				if ((strlen($row['user_password']) == 34 && ($this->passwords_manager->check(md5($password_old_format), $row['user_password']) || $this->passwords_manager->check(md5(utf8_to_cp1252($password_old_format)), $row['user_password'])))  					|| (strlen($row['user_password']) == 32  && (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])))  				{ -					$hash = phpbb_hash($password_new_format); +					$hash = $this->passwords_manager->hash($password_new_format);  					// Update the password in the users table to the new format and remove user_pass_convert flag  					$sql = 'UPDATE ' . USERS_TABLE . ' @@ -234,12 +242,12 @@ class db extends \phpbb\auth\provider\base  		}  		// Check password ... -		if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password'])) +		if (!$row['user_pass_convert'] && $this->passwords_manager->check($password, $row['user_password']))  		{  			// Check for old password hash...  			if (strlen($row['user_password']) == 32)  			{ -				$hash = phpbb_hash($password); +				$hash = $this->passwords_manager->hash($password);  				// Update the password in the users table to the new format  				$sql = 'UPDATE ' . USERS_TABLE . " diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php index 9d29789567..1e4dffde5b 100644 --- a/phpBB/phpbb/auth/provider/ldap.php +++ b/phpBB/phpbb/auth/provider/ldap.php @@ -27,16 +27,25 @@ if (!defined('IN_PHPBB'))  class ldap extends \phpbb\auth\provider\base  {  	/** +	* phpBB passwords manager +	* +	* @var \phpbb\passwords\manager +	*/ +	protected $passwords_manager; + +	/**  	 * LDAP Authentication Constructor  	 * -	 * @param 	\phpbb\db\driver\driver	$db -	 * @param 	\phpbb\config\config	$config -	 * @param 	\phpbb\user		$user +	 * @param 	\phpbb\db\driver\driver		$db +	 * @param 	\phpbb\config\config		$config +	  * @param	\phpbb\passwords\manager	$passwords_manager +	 * @param 	\phpbb\user			$user  	 */ -	public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\user $user) +	public function __construct(\phpbb\db\driver\driver $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\user $user)  	{  		$this->db = $db;  		$this->config = $config; +		$this->passwords_manager = $passwords_manager;  		$this->user = $user;  	} @@ -244,7 +253,7 @@ class ldap extends \phpbb\auth\provider\base  					// generate user account data  					$ldap_user_row = array(  						'username'		=> $username, -						'user_password'	=> phpbb_hash($password), +						'user_password'	=> $this->passwords_manager->hash($password),  						'user_email'	=> (!empty($this->config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($this->config['ldap_email'])][0]) : '',  						'group_id'		=> (int) $row['group_id'],  						'user_type'		=> USER_NORMAL, diff --git a/phpBB/phpbb/db/migration/data/v310/passwords.php b/phpBB/phpbb/db/migration/data/v310/passwords.php new file mode 100644 index 0000000000..c422f681ba --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/passwords.php @@ -0,0 +1,40 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2 +* +*/ + +namespace phpbb\db\migration\data\v310; + +class passwords extends \phpbb\db\migration\migration +{ +	static public function depends_on() +	{ +		return array('\phpbb\db\migration\data\v30x\release_3_0_11'); +	} + +	public function update_schema() +	{ +		return array( +			'change_columns'	=> array( +				$this->table_prefix . 'users'			=> array( +					'user_password'			=> array('VCHAR:255', ''), +				), +			), +		); +	} + +	public function revert_schema() +	{ +		return array( +			'change_columns'	=> array( +				$this->table_prefix . 'users'			=> array( +					'user_password'			=> array('VCHAR:40', ''), +				), +			), +		); +	} +} diff --git a/phpBB/phpbb/passwords/driver/base.php b/phpBB/phpbb/passwords/driver/base.php new file mode 100644 index 0000000000..298b7367ad --- /dev/null +++ b/phpBB/phpbb/passwords/driver/base.php @@ -0,0 +1,70 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords\driver; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +abstract class base implements \phpbb\passwords\driver\driver_interface +{ +	/** @var phpbb\config\config */ +	protected $config; + +	/** @var phpbb\passwords\driver\helper */ +	protected $helper; + +	/** @var driver name */ +	protected $name; + +	/** +	* Constructor of passwords driver object +	* +	* @return string	Hash prefix +	*/ +	public function __construct(\phpbb\config\config $config, \phpbb\passwords\driver\helper $helper) +	{ +		$this->config = $config; +		$this->helper = $helper; +	} + +	/** +	* @inheritdoc +	*/ +	public function is_supported() +	{ +		return true; +	} + +	/** +	* @inheritdoc +	*/ +	public function get_name() +	{ +		return $this->name; +	} + +	/** +	* Set driver name +	* +	* @param string $name Driver name +	*/ +	public function set_name($name) +	{ +		$this->name = $name; +	} +} diff --git a/phpBB/phpbb/passwords/driver/bcrypt.php b/phpBB/phpbb/passwords/driver/bcrypt.php new file mode 100644 index 0000000000..2f6cc1b381 --- /dev/null +++ b/phpBB/phpbb/passwords/driver/bcrypt.php @@ -0,0 +1,102 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords\driver; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +class bcrypt extends \phpbb\passwords\driver\base +{ +	const PREFIX = '$2a$'; + +	/** +	* @inheritdoc +	*/ +	public function get_prefix() +	{ +		return self::PREFIX; +	} + +	/** +	* @inheritdoc +	*/ +	public function hash($password, $salt = '') +	{ +		// The 2x and 2y prefixes of bcrypt might not be supported +		// Revert to 2a if this is the case +		$prefix = (!$this->is_supported()) ? '$2a$' : $this->get_prefix(); + +		if ($salt == '') +		{ +			$salt = $prefix . '10$' . $this->get_random_salt(); +		} + +		$hash = crypt($password, $salt); +		if (strlen($hash) < 60) +		{ +			return false; +		} +		return $hash; +	} + +	/** +	* @inheritdoc +	*/ +	public function check($password, $hash) +	{ +		$salt = substr($hash, 0, 29); +		if (strlen($salt) != 29) +		{ +			return false; +		} + +		if ($hash == $this->hash($password, $salt)) +		{ +			return true; +		} +		return false; +	} + +	/** +	* Get a random salt value with a length of 22 characters +	* +	* @return string Salt for password hashing +	*/ +	protected function get_random_salt() +	{ +		return $this->helper->hash_encode64($this->helper->get_random_salt(22), 22); +	} + +	/** +	* @inheritdoc +	*/ +	public function get_settings_only($hash, $full = false) +	{ +		if ($full) +		{ +			$pos = stripos($hash, '$', 1) + 1; +			$length = 22 + (strripos($hash, '$') + 1 - $pos); +		} +		else +		{ +			$pos = strripos($hash, '$') + 1; +			$length = 22; +		} +		return substr($hash, $pos, $length); +	} +} diff --git a/phpBB/phpbb/passwords/driver/bcrypt_2y.php b/phpBB/phpbb/passwords/driver/bcrypt_2y.php new file mode 100644 index 0000000000..8da8c8dbc8 --- /dev/null +++ b/phpBB/phpbb/passwords/driver/bcrypt_2y.php @@ -0,0 +1,42 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords\driver; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +class bcrypt_2y extends \phpbb\passwords\driver\bcrypt +{ +	const PREFIX = '$2y$'; + +	/** +	* @inheritdoc +	*/ +	public function get_prefix() +	{ +		return self::PREFIX; +	} + +	/** +	* @inheritdoc +	*/ +	public function is_supported() +	{ +		return (version_compare(PHP_VERSION, '5.3.7', '<')) ? false : true; +	} +} diff --git a/phpBB/phpbb/passwords/driver/driver_interface.php b/phpBB/phpbb/passwords/driver/driver_interface.php new file mode 100644 index 0000000000..8c12834641 --- /dev/null +++ b/phpBB/phpbb/passwords/driver/driver_interface.php @@ -0,0 +1,70 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords\driver; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +interface driver_interface +{ +	/** +	* Check if hash type is supported +	* +	* @return bool		True if supported, false if not +	*/ +	public function is_supported(); +	/** +	* Returns the hash prefix +	* +	* @return string	Hash prefix +	*/ +	public function get_prefix(); + +	/** +	* Hash the password +	* +	* @return string	Password hash +	*/ +	public function hash($password); + +	/** +	* Check the password against the supplied hash +	* +	* @param string		$password The password to check +	* @param string		$hash The password hash to check against +	* @return bool		True if password is correct, else false +	*/ +	public function check($password, $hash); + +	/** +	* Get only the settings of the specified hash +	* +	* @param string		$hash Password hash +	* @param bool		$full Return full settings or only settings +	*			related to the salt +	* @return string	String containing the hash settings +	*/ +	public function get_settings_only($hash, $full = false); + +	/** +	* Get the driver name +	* +	* @return string	Driver name +	*/ +	public function get_name(); +} diff --git a/phpBB/phpbb/passwords/driver/helper.php b/phpBB/phpbb/passwords/driver/helper.php new file mode 100644 index 0000000000..da66347ac3 --- /dev/null +++ b/phpBB/phpbb/passwords/driver/helper.php @@ -0,0 +1,148 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords\driver; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +class helper +{ +	/** +	* @var phpbb\config\config +	*/ +	protected $config; + +	/** +	* base64 alphabet +	* @var string +	*/ +	public $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; + +	/** +	* Construct a driver helper object +	* +	* @param phpbb\config\config $config phpBB configuration +	*/ +	public function __construct(\phpbb\config\config $config) +	{ +		$this->config = $config; +	} + +	/** +	* Base64 encode hash +	* +	* @param string $input Input string +	* @param int $count Input string length +	* +	* @return string base64 encoded string +	*/ +	public function hash_encode64($input, $count) +	{ +		$output = ''; +		$i = 0; + +		do +		{ +			$value = ord($input[$i++]); +			$output .= $this->itoa64[$value & 0x3f]; + +			if ($i < $count) +			{ +				$value |= ord($input[$i]) << 8; +			} + +			$output .= $this->itoa64[($value >> 6) & 0x3f]; + +			if ($i++ >= $count) +			{ +				break; +			} + +			if ($i < $count) +			{ +				$value |= ord($input[$i]) << 16; +			} + +			$output .= $this->itoa64[($value >> 12) & 0x3f]; + +			if ($i++ >= $count) +			{ +				break; +			} + +			$output .= $this->itoa64[($value >> 18) & 0x3f]; +		} +		while ($i < $count); + +		return $output; +	} + +	/** +	* Return unique id +	* @param string $extra additional entropy +	* +	* @return string Unique id +	*/ +	public function unique_id($extra = 'c') +	{ +		static $dss_seeded = false; + +		$val = $this->config['rand_seed'] . microtime(); +		$val = md5($val); +		$this->config['rand_seed'] = md5($this->config['rand_seed'] . $val . $extra); + +		if ($dss_seeded !== true && ($this->config['rand_seed_last_update'] < time() - rand(1,10))) +		{ +			$this->config->set('rand_seed_last_update', time(), true); +			$this->config->set('rand_seed', $this->config['rand_seed'], true); +			$dss_seeded = true; +		} + +		return substr($val, 4, 16); +	} + +	/** +	* Get random salt with specified length +	* +	* @param int $length Salt length +	*/ +	public function get_random_salt($length) +	{ +		$random = ''; + +		if (($fh = @fopen('/dev/urandom', 'rb'))) +		{ +			$random = fread($fh, $length); +			fclose($fh); +		} + +		if (strlen($random) < $length) +		{ +			$random = ''; +			$random_state = $this->unique_id(); + +			for ($i = 0; $i < $length; $i += 16) +			{ +				$random_state = md5($this->unique_id() . $random_state); +				$random .= pack('H*', md5($random_state)); +			} +			$random = substr($random, 0, $length); +		} +		return $random; +	} +} diff --git a/phpBB/phpbb/passwords/driver/phpass.php b/phpBB/phpbb/passwords/driver/phpass.php new file mode 100644 index 0000000000..32ccc399ba --- /dev/null +++ b/phpBB/phpbb/passwords/driver/phpass.php @@ -0,0 +1,34 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords\driver; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +class phpass extends \phpbb\passwords\driver\salted_md5 +{ +	const PREFIX = '$P$'; + +	/** +	* @inheritdoc +	*/ +	public function get_prefix() +	{ +		return self::PREFIX; +	} +} diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php new file mode 100644 index 0000000000..13d25560fe --- /dev/null +++ b/phpBB/phpbb/passwords/driver/salted_md5.php @@ -0,0 +1,146 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords\driver; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +class salted_md5 extends \phpbb\passwords\driver\base +{ +	const PREFIX = '$H$'; + +	/** +	* @inheritdoc +	*/ +	public function get_prefix() +	{ +		return self::PREFIX; +	} + +	/** +	* @inheritdoc +	*/ +	public function hash($password, $setting = '') +	{ +		if ($setting != '') +		{ +			if (($settings = $this->get_hash_settings($setting)) === false) +			{ +				return false; +			} +		} +		else +		{ +			if (($settings = $this->get_hash_settings($this->generate_salt())) === false) +			{ +				return false; +			} +		} + +		$hash = md5($settings['salt'] . $password, true); +		do +		{ +			$hash = md5($hash . $password, true); +		} +		while (--$settings['count']); + +		$output = $settings['full']; +		$output .= $this->helper->hash_encode64($hash, 16); + +		if (strlen($output) == 34) +		{ +			return $output; +		} + +		// Should we really just return the md5 of the password? O.o +		return md5($password); +	} + +	/** +	* @inheritdoc +	*/ +	public function check($password, $hash) +	{ +		if (strlen($hash) !== 34) +		{ +			return (md5($password) === $hash) ? true : false; +		} +		// No need to check prefix, already did that in manage + +		if ($hash === $this->hash($password, $hash)) +		{ +			return true; +		} +		return false; +	} + +	/** +	* Generate salt for hashing method +	* +	* @return string Salt for hashing method +	*/ +	protected function generate_salt() +	{ +		$salt = ''; +		$random = ''; +		$count = 6; + +		$random = $this->helper->get_random_salt($count); + +		$salt = $this->get_prefix(); +		$salt .= $this->helper->itoa64[min($count + 5, 30)]; +		$salt .= $this->helper->hash_encode64($random, $count); + +		return $salt; +	} + +	/** +	* Get hash settings +	* +	* @return array Array containing the count_log2, salt, and full hash +	*		settings string +	*/ +	public function get_hash_settings($hash) +	{ +		if (empty($hash)) +		{ +			return false; +		} +		$count_log2 = strpos($this->helper->itoa64, $hash[3]); +		$salt = substr($hash, 4, 8); + +		if ($count_log2 < 7 || $count_log2 > 30 || strlen($salt) != 8) +		{ +			return false; +		} + +		return array( +			'count'	=> 1 << $count_log2, +			'salt'	=> $salt, +			'full'	=> substr($hash, 0, 12), +		); +	} + +	/** +	* @inheritdoc +	*/ +	public function get_settings_only($hash, $full = false) +	{ +		return substr($hash, 3, 9); +	} +} diff --git a/phpBB/phpbb/passwords/helper.php b/phpBB/phpbb/passwords/helper.php new file mode 100644 index 0000000000..28a13d2224 --- /dev/null +++ b/phpBB/phpbb/passwords/helper.php @@ -0,0 +1,200 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +class helper +{ +	/** +	* @var phpbb\passwords\manager +	*/ +	protected $manager; + +	/** +	* Set the passwords manager instance +	* +	* @param phpbb\passwords\manager $manager Crypto manager object +	*/ +	public function set_manager(\phpbb\passwords\manager $manager) +	{ +		if ($this->manager === null) +		{ +			$this->manager = $manager; +		} +	} + +	/** +	* Get hash settings from combined hash +	* +	* @param string $hash Password hash of combined hash +	* +	* @return array An array containing the hash settings for the hash +	*		types in successive order as described by the comined +	*		password hash +	*/ +	protected function get_combined_hash_settings($hash) +	{ +		preg_match('#^\$([a-zA-Z0-9\\\]*?)\$#', $hash, $match); +		$hash_settings = substr($hash, strpos($hash, $match[1]) + strlen($match[1]) + 1); +		$matches = explode('\\', $match[1]); +		foreach ($matches as $cur_type) +		{ +			$dollar_position = strpos($hash_settings, '$'); +			$output[] = substr($hash_settings, 0, ($dollar_position != false) ? $dollar_position : strlen($hash_settings)); +			$hash_settings = substr($hash_settings, $dollar_position + 1); +		} + +		return $output; +	} + +	/** +	* Create combined hash from already hashed password +	* +	* @param string $password_hash Complete current password hash +	* @param string $type Type of the hashing algorithm the password hash +	*		should be combined with +	* @return string|bool Combined password hash if combined hashing was +	*		successful, else false +	*/ +	public function combined_hash_password($password_hash, $type) +	{ +		$data = array( +			'prefix' => '$', +			'settings' => '$', +		); +		$hash_settings = $this->get_combined_hash_settings($password_hash); +		$hash = $hash_settings[0]; + +		// Put settings of current hash into data array +		$stored_hash_type = $this->manager->detect_algorithm($password_hash); +		$this->combine_hash_output($data, 'prefix', $stored_hash_type->get_prefix()); +		$this->combine_hash_output($data, 'settings', $stored_hash_type->get_settings_only($password_hash)); + +		// Hash current hash with the defined types +		foreach ($type as $cur_type) +		{ +			if (isset($this->manager->algorithms[$cur_type])) +			{ +				$new_hash_type = $this->manager->algorithms[$cur_type]; +			} +			else +			{ +				return false; +			} + +			$new_hash = $new_hash_type->hash(str_replace($stored_hash_type->get_settings_only($password_hash), '', $hash)); +			$this->combine_hash_output($data, 'prefix', $new_hash_type->get_prefix()); +			$this->combine_hash_output($data, 'settings', substr(str_replace('$', '\\', $new_hash_type->get_settings_only($new_hash, true)), 0)); +			$hash = str_replace($new_hash_type->get_settings_only($new_hash), '', $this->obtain_hash_only($new_hash)); +		} +		return $this->combine_hash_output($data, 'hash', $hash); +	} + +	/** +	* Check combined password hash against the supplied password +	* +	* @param string $password Password entered by user +	* @param array $stored_hash_type An array containing the hash types +	*				as described by stored password hash +	* @param string $hash Stored password hash +	* +	* @return bool True if password is correct, false if not +	*/ +	public function check_combined_hash($password, $stored_hash_type, $hash) +	{ +		$cur_hash = ''; +		$i = 0; +		$data = array( +			'prefix' => '$', +			'settings' => '$', +		); +		$hash_settings = $this->get_combined_hash_settings($hash); +		foreach ($stored_hash_type as $key => $hash_type) +		{ +			$rebuilt_hash = $this->rebuild_hash($hash_type->get_prefix(), $hash_settings[$i]); +			$this->combine_hash_output($data, 'prefix', $key); +			$this->combine_hash_output($data, 'settings', $hash_settings[$i]); +			$cur_hash = $hash_type->hash($password, $rebuilt_hash); +			$password = str_replace($rebuilt_hash, '', $cur_hash); +			$i++; +		} +		return ($hash === $this->combine_hash_output($data, 'hash', $password)); +	} + +	/** +	* Combine hash prefixes, settings, and actual hash +	* +	* @param array $data Array containing the keys 'prefix' and 'settings'. +	*			It will hold the prefixes and settings +	* @param string $type Data type of the supplied value +	* @param string $value Value that should be put into the data array +	* +	* @return string|none Return complete combined hash if type is neither +	*			'prefix' nor 'settings', nothing if it is +	*/ +	protected function combine_hash_output(&$data, $type, $value) +	{ +		if ($type == 'prefix') +		{ +			$data[$type] .= ($data[$type] !== '$') ? '\\' : ''; +			$data[$type] .= str_replace('$', '', $value); +		} +		elseif ($type == 'settings') +		{ +			$data[$type] .= ($data[$type] !== '$') ? '$' : ''; +			$data[$type] .= $value; +		} +		else +		{ +			// Return full hash +			return $data['prefix'] . $data['settings'] . '$' . $value; +		} +	} + +	/** +	* Rebuild hash for hashing functions +	* +	* @param string $prefix Hash prefix +	* @param string $settings Hash settings +	* +	* @return string Rebuilt hash for hashing functions +	*/ +	protected function rebuild_hash($prefix, $settings) +	{ +		$rebuilt_hash = $prefix; +		if (strpos($settings, '\\') !== false) +		{ +			$settings = str_replace('\\', '$', $settings); +		} +		$rebuilt_hash .= $settings; +		return $rebuilt_hash; +	} + +	/** +	* Obtain only the actual hash after the prefixes +	* +	* @param string		$hash The full password hash +	* @return string	Actual hash (incl. settings) +	*/ +	protected function obtain_hash_only($hash) +	{ +		return substr($hash, strripos($hash, '$') + 1); +	} +} diff --git a/phpBB/phpbb/passwords/manager.php b/phpBB/phpbb/passwords/manager.php new file mode 100644 index 0000000000..6ec9eefaed --- /dev/null +++ b/phpBB/phpbb/passwords/manager.php @@ -0,0 +1,271 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\passwords; + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package passwords +*/ +class manager +{ +	/** +	* Default hashing method +	*/ +	protected $type = false; + +	/** +	* Hashing algorithm type map +	* Will be used to map hash prefix to type +	*/ +	protected $type_map = false; + +	/** +	* Service collection of hashing algorithms +	* Needs to be public for passwords helper +	*/ +	public $algorithms = false; + +	/** +	* Password convert flag. Signals that password should be converted +	*/ +	public $convert_flag = false; + +	/** +	* Crypto helper +	* @var phpbb\passwords\helper +	*/ +	protected $helper; + +	/** +	* phpBB configuration +	* @var phpbb\config\config +	*/ +	protected $config; + +	/** +	* Construct a passwords object +	* +	* @param phpbb\config\config $config phpBB configuration +	* @param array $hashing_algorithms Hashing driver +	*			service collection +	* @param phpbb\passwords\helper $helper Passwords helper object +	* @param string $default Default driver name +	*/ +	public function __construct(\phpbb\config\config $config, $hashing_algorithms, \phpbb\passwords\helper $helper, $default) +	{ +		$this->config = $config; +		$this->type = $default; + +		$this->fill_type_map($hashing_algorithms); +		$this->load_passwords_helper($helper); +	} + +	/** +	* Fill algorithm type map +	* +	* @param phpbb\di\service_collection $hashing_algorithms +	*/ +	protected function fill_type_map($hashing_algorithms) +	{ +		foreach ($hashing_algorithms as $algorithm) +		{ +			if (!isset($this->algorithms[$algorithm->get_name()])) +			{ +				$this->algorithms[$algorithm->get_name()] = $algorithm; +			} + +			if (!isset($this->type_map[$algorithm->get_prefix()])) +			{ +				$this->type_map[$algorithm->get_prefix()] = $algorithm->get_name(); +			} +		} +	} + +	/** +	* Load passwords helper class +	* +	* @param phpbb\passwords\helper $helper Passwords helper object +	*/ +	protected function load_passwords_helper(\phpbb\passwords\helper $helper) +	{ +		if ($this->helper === null) +		{ +			$this->helper = $helper; +			$this->helper->set_manager($this); +		} +	} + +	/** +	* Get the algorithm specified by a specific prefix +	* +	* @param string $prefix Password hash prefix +	* +	* @return object The hash type object +	*/ +	protected function get_algorithm($prefix) +	{ +		if (isset($this->type_map[$prefix]) && isset($this->algorithms[$this->type_map[$prefix]])) +		{ +			return $this->algorithms[$this->type_map[$prefix]]; +		} +		else +		{ +			return false; +		} +	} + +	/** +	* Detect the hash type of the supplied hash +	* +	* @param string $hash Password hash that should be checked +	* +	* @return object|bool The hash type object or false if the specified +	*			type is not supported +	*/ +	public function detect_algorithm($hash) +	{ +		/* +		* preg_match() will also show hashing algos like $2a\H$, which +		* is a combination of bcrypt and phpass. Legacy algorithms +		* like md5 will not be matched by this and need to be treated +		* differently. +		*/ +		if (!preg_match('#^\$([a-zA-Z0-9\\\]*?)\$#', $hash, $match)) +		{ +			return $this->get_algorithm('$H$'); +		} + +		// Be on the lookout for multiple hashing algorithms +		// 2 is correct: H\2a > 2, H\P > 2 +		if (strlen($match[1]) > 2) +		{ +			$hash_types = explode('\\', $match[1]); +			$return_ary = array(); +			foreach ($hash_types as $type) +			{ +				// we do not support the same hashing +				// algorithm more than once +				if (isset($return_ary[$type])) +				{ +					return false; +				} + +				$return_ary[$type] = $this->get_algorithm("\${$type}\$"); + +				if (empty($return_ary[$type])) +				{ + +					return false; +				} +			} +			return $return_ary; +		} + +		// get_algorithm() will automatically return false if prefix +		// is not supported +		return $this->get_algorithm($match[0]); +	} + +	/** +	* Hash supplied password +	* +	* @param string $password Password that should be hashed +	* @param string $type Hash type. Will default to standard hash type if +	*			none is supplied +	* @return string|bool Password hash of supplied password or false if +	*			if something went wrong during hashing +	*/ +	public function hash($password, $type = '') +	{ +		if (strlen($password) > 4096) +		{ +			// If the password is too huge, we will simply reject it +			// and not let the server try to hash it. +			return false; +		} + +		$type = ($type === '') ? $this->type : $type; + +		if (is_array($type)) +		{ +			return $this->helper->combined_hash_password($password, $type); +		} + +		if (isset($this->algorithms[$type])) +		{ +			$hashing_algorithm = $this->algorithms[$type]; +		} +		else +		{ +			return false; +		} + +		// Do not support 8-bit characters with $2a$ bcrypt +		// Also see http://www.php.net/security/crypt_blowfish.php +		if ($type === 'passwords.driver.bcrypt' || ($type === 'passwords.driver.bcrypt_2y' && !$hashing_algorithm->is_supported())) +		{ +			if (ord($password[strlen($password)-1]) & 128) +			{ +				return false; +			} +		} + +		return $hashing_algorithm->hash($password); +	} + +	/** +	* Check supplied password against hash and set convert_flag if password +	* needs to be converted to different format (preferrably newer one) +	* +	* @param string $password Password that should be checked +	* @param string $hash Stored hash +	* @return string|bool True if password is correct, false if not +	*/ +	public function check($password, $hash) +	{ +		if (strlen($password) > 4096) +		{ +			// If the password is too huge, we will simply reject it +			// and not let the server try to hash it. +			return false; +		} + +		// First find out what kind of hash we're dealing with +		$stored_hash_type = $this->detect_algorithm($hash); +		if ($stored_hash_type == false) +		{ +			return false; +		} + +		// Multiple hash passes needed +		if (is_array($stored_hash_type)) +		{ +			return $this->helper->check_combined_hash($password, $stored_hash_type, $hash); +		} + +		if ($stored_hash_type->get_name() !== $this->type) +		{ +			$this->convert_flag = true; +		} +		else +		{ +			$this->convert_flag = false; +		} + +		return $stored_hash_type->check($password, $hash); +	} +}  | 
