ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup migrateHash. Use better parameter names to avoid conflict with global .

pull/3609/head 1.36.25
Isaac Connor 2022-08-29 16:02:04 -04:00
parent 1f8fc96226
commit 700ed2d9f5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/includes/auth.php
View File

@ -39,15 +39,14 @@ function password_type($password) {
// this function migrates mysql hashing to bcrypt, if you are using PHP >= 5.5
// will be called after successful login, only if mysql hashing is detected
function migrateHash($user, $pass) {
function migrateHash($username, $password) {
if ( function_exists('password_hash') ) {
ZM\Info("Migrating $user to bcrypt scheme");
global $user;
ZM\Info("Migrating $username to bcrypt scheme");
// let it generate its own salt, and ensure bcrypt as PASSWORD_DEFAULT may change later
// we can modify this later to support argon2 etc as switch to its own password signature detection
$bcrypt_hash = password_hash($pass, PASSWORD_BCRYPT);
//ZM\Info ("hased bcrypt $pass is $bcrypt_hash");
$update_password_sql = 'UPDATE Users SET Password=\''.$bcrypt_hash.'\' WHERE Username=\''.$user.'\'';
dbQuery($update_password_sql);
$bcrypt_hash = password_hash($password, PASSWORD_BCRYPT);
dbQuery('UPDATE Users SET Password=? WHERE Username=?', array($bcrypt_hash, $username));
$user['Password'] = $bcrypt_hash;
# Since password field has changed, existing auth_hash is no longer valid
generateAuthHash(ZM_AUTH_HASH_IPS, true);