mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
[ticket/12352] Add driver for woltlab community framework 1 passwords
PHPBB3-12352
This commit is contained in:
parent
2d7593995e
commit
cf61d35d75
4 changed files with 77 additions and 0 deletions
|
@ -62,6 +62,14 @@ services:
|
||||||
tags:
|
tags:
|
||||||
- { name: passwords.driver }
|
- { name: passwords.driver }
|
||||||
|
|
||||||
|
passwords.driver.sha1_wcf1:
|
||||||
|
class: phpbb\passwords\driver\sha1_wcf1
|
||||||
|
arguments:
|
||||||
|
- @config
|
||||||
|
- @passwords.driver_helper
|
||||||
|
tags:
|
||||||
|
- { name: passwords.driver }
|
||||||
|
|
||||||
passwords.driver.sha1:
|
passwords.driver.sha1:
|
||||||
class: phpbb\passwords\driver\sha1
|
class: phpbb\passwords\driver\sha1
|
||||||
arguments:
|
arguments:
|
||||||
|
|
67
phpBB/phpbb/passwords/driver/sha1_wcf1.php
Normal file
67
phpBB/phpbb/passwords/driver/sha1_wcf1.php
Normal file
|
@ -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 sha1_wcf1 extends base
|
||||||
|
{
|
||||||
|
const PREFIX = '$wcf1$';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @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 standard WCF 1.x, i.e. WBB3 and similar
|
||||||
|
return $hash === sha1($user_row['user_passwd_salt'] . sha1($user_row['user_passwd_salt'] . sha1($password)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritdoc
|
||||||
|
*/
|
||||||
|
public function get_settings_only($hash, $full = false)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
|
@ -28,6 +28,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
|
||||||
'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.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_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.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.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),
|
||||||
|
|
|
@ -36,6 +36,7 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
|
||||||
'passwords.driver.convert_password' => new \phpbb\passwords\driver\convert_password($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_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' => 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_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.md5_vb' => new \phpbb\passwords\driver\md5_vb($config, $this->driver_helper),
|
||||||
);
|
);
|
||||||
|
|
Loading…
Add table
Reference in a new issue