harmacist/vichan
1
0
Fork 0
forked from GithubBackups/vichan
Code Pull Requests Activity

auth.php: use password_hash with bcrypt and password_verify for login

Browse Source
This commit is contained in:
fowr 2025-04-16 12:31:18 -03:00 committed by Zankaria
parent d91ae6e3e5
commit 0b560b2353
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
inc/mod/auth.php
View File

@ -46,22 +46,18 @@ function crypt_password(string $password): array {
global $config; global $config;
// `salt` database field is reused as a version value. We don't want it to be 0. // `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; $version = $config['password_crypt_version'] ? $config['password_crypt_version'] : 1;
$new_salt = generate_salt(); $hash = \password_hash($password, \PASSWORD_BCRYPT);
$password = crypt($password, $config['password_crypt'] . $new_salt . "$"); return [$version, $hash];
return [ $version, $password ];
} }
function test_password(string $password, string $salt, string $test): array { 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 $version = (int)$version;
// password hash was kept previously if ($version < 2) {
$version = strlen($salt) <= 8 ? (int)$salt : 0; $ok = \hash_equals($db_hash, \crypt($input_password, $db_hash));
if ($version == 0) {
$comp = hash('sha256', $salt . sha1($test));
} else { } else {
$comp = crypt($test, $password); $ok = \password_verify($input_password, $db_hash);
} }
return [ $version, hash_equals($password, $comp) ]; return [$version, $ok];
} }
function generate_salt(): string { function generate_salt(): string {
@ -91,7 +87,7 @@ function login(string $username, string $password): array|false {
list($version, $ok) = test_password($user['password'], $user['version'], $password); list($version, $ok) = test_password($user['password'], $user['version'], $password);
if ($ok) { if ($ok) {
if ($config['password_crypt_version'] > $version) { if ((int)$user['version'] < 2) {
// It's time to upgrade the password hashing method! // It's time to upgrade the password hashing method!
list ($user['version'], $user['password']) = crypt_password($password); list ($user['version'], $user['password']) = crypt_password($password);
$query = prepare("UPDATE ``mods`` SET `password` = :password, `version` = :version WHERE `id` = :id"); $query = prepare("UPDATE ``mods`` SET `password` = :password, `version` = :version WHERE `id` = :id");