forked from leftypol/leftypol
auth.php: use password_hash with bcrypt and password_verify for login
This commit is contained in:
parent
24e43a5aa1
commit
3510f05fe8
1 changed files with 9 additions and 11 deletions
|
|
@ -46,22 +46,20 @@ function crypt_password($password) {
|
|||
global $config;
|
||||
// `salt` database field is reused as a version value. We don't want it to be 0.
|
||||
$version = $config['password_crypt_version'] ? $config['password_crypt_version'] : 1;
|
||||
$new_salt = generate_salt();
|
||||
$password = crypt($password, $config['password_crypt'] . $new_salt . "$");
|
||||
return array($version, $password);
|
||||
$hash = \password_hash($password, \PASSWORD_BCRYPT);
|
||||
return [$version, $hash];
|
||||
}
|
||||
|
||||
function test_password($password, $salt, $test) {
|
||||
function test_password(string $db_hash, string|int $version, string $input_password): array {
|
||||
// Version = 0 denotes an old password hashing schema. In the same column, the
|
||||
// password hash was kept previously
|
||||
$version = (strlen($salt) <= 8) ? (int) $salt : 0;
|
||||
|
||||
if ($version == 0) {
|
||||
$comp = hash('sha256', $salt . sha1($test));
|
||||
$version = (int)$version;
|
||||
if ($version < 2) {
|
||||
$ok = \hash_equals($db_hash, \crypt($input_password, $db_hash));
|
||||
} else {
|
||||
$comp = crypt($test, $password);
|
||||
$ok = \password_verify($input_password, $db_hash);
|
||||
}
|
||||
return array($version, hash_equals($password, $comp));
|
||||
return [$version, $ok];
|
||||
}
|
||||
|
||||
function generate_salt() {
|
||||
|
|
@ -79,7 +77,7 @@ function login($username, $password) {
|
|||
list($version, $ok) = test_password($user['password'], $user['version'], $password);
|
||||
|
||||
if ($ok) {
|
||||
if ($config['password_crypt_version'] > $version) {
|
||||
if ((int)$user['version'] < 2) {
|
||||
// It's time to upgrade the password hashing method!
|
||||
list ($user['version'], $user['password']) = crypt_password($password);
|
||||
$query = prepare("UPDATE ``mods`` SET `password` = :password, `version` = :version WHERE `id` = :id");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue