mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
[ticket/12352] Add passwords driver for sha1 password hashes
PHPBB3-12352
This commit is contained in:
Marc Alexander
parent
d9e49fae23
commit
033272f968
4 changed files with 211 additions and 2 deletions
|
|
@ -54,6 +54,14 @@ services:
|
|||
tags:
|
||||
- { name: passwords.driver }
|
||||
|
||||
passwords.driver.sha1:
|
||||
class: phpbb\passwords\driver\sha1
|
||||
arguments:
|
||||
- @config
|
||||
- @passwords.driver_helper
|
||||
tags:
|
||||
- { name: passwords.driver }
|
||||
|
||||
passwords.driver.phpbb2_md5:
|
||||
class: phpbb\passwords\driver\phpbb2_md5
|
||||
arguments:
|
||||
|
|
|
|||
59
phpBB/phpbb/passwords/driver/sha1.php
Normal file
59
phpBB/phpbb/passwords/driver/sha1.php
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
<?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 sha1 extends base
|
||||
{
|
||||
const PREFIX = '$sha1$';
|
||||
|
||||
/**
|
||||
* @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())
|
||||
{
|
||||
return $hash === sha1($password);
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function get_settings_only($hash, $full = false)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -29,8 +29,9 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
|
|||
'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.convert_password' => new \phpbb\passwords\driver\convert_password($config, $this->driver_helper),
|
||||
'passwords.driver.phpbb2_md5' => new \phpbb\passwords\driver\phpbb2_md5($request, $phpbb_root_path, $php_ext),
|
||||
'passwords.driver.sha1' => new \phpbb\passwords\driver\sha1($config, $this->driver_helper),
|
||||
);
|
||||
$this->passwords_drivers['passwords.driver.phpbb2_md5'] = new \phpbb\passwords\driver\phpbb2_md5($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext);
|
||||
}
|
||||
|
||||
public function data_helper_encode64()
|
||||
|
|
@ -128,6 +129,9 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
|
|||
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')),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -160,4 +164,141 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
|
|||
|
||||
$this->assertSame(false, $this->passwords_drivers['passwords.driver.convert_password']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae'));
|
||||
}
|
||||
|
||||
public function test_sha1_driver()
|
||||
{
|
||||
$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1']->hash('foobar'));
|
||||
|
||||
$this->assertSame(false, $this->passwords_drivers['passwords.driver.sha1']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae'));
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,8 +35,9 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
|
|||
'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.phpbb2_md5' => new \phpbb\passwords\driver\phpbb2_md5($request, $phpbb_root_path, $php_ext),
|
||||
'passwords.driver.sha1' => new \phpbb\passwords\driver\sha1($config, $this->driver_helper),
|
||||
);
|
||||
$this->passwords_drivers['passwords.driver.phpbb2_md5'] = new \phpbb\passwords\driver\phpbb2_md5($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext);
|
||||
|
||||
$this->helper = new \phpbb\passwords\helper;
|
||||
// Set up passwords manager
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue