diff --git a/.devtools/data_generation_scripts/9999_reset_admin_password.php b/.devtools/data_generation_scripts/9999_reset_admin_password.php index 2023c1c0..5f55fed5 100644 --- a/.devtools/data_generation_scripts/9999_reset_admin_password.php +++ b/.devtools/data_generation_scripts/9999_reset_admin_password.php @@ -15,5 +15,5 @@ if ($adminUserRow == null) } $adminUserRow->update([ - 'password' => password_hash('admin', PASSWORD_DEFAULT) + 'password' => password_hash('admin', PASSWORD_ARGON2ID) ]); diff --git a/middleware/DefaultAuthMiddleware.php b/middleware/DefaultAuthMiddleware.php index 6b5cfff2..1c0c3dfa 100644 --- a/middleware/DefaultAuthMiddleware.php +++ b/middleware/DefaultAuthMiddleware.php @@ -40,10 +40,10 @@ class DefaultAuthMiddleware extends AuthMiddleware $sessionKey = SessionService::getInstance()->CreateSession($user->id, $stayLoggedInPermanently); self::SetSessionCookie($sessionKey); - if (password_needs_rehash($user->password, PASSWORD_DEFAULT)) + if (password_needs_rehash($user->password, PASSWORD_ARGON2ID)) { $user->update([ - 'password' => password_hash($inputPassword, PASSWORD_DEFAULT) + 'password' => password_hash($inputPassword, PASSWORD_ARGON2ID) ]); } diff --git a/migrations/0027.php b/migrations/0027.php index db745475..44bf3dc8 100644 --- a/migrations/0027.php +++ b/migrations/0027.php @@ -9,7 +9,7 @@ if (defined('GROCY_HTTP_USER')) // Migrate old user defined in config file to database $newUserRow = $db->users()->createRow([ 'username' => GROCY_HTTP_USER, - 'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_DEFAULT) + 'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_ARGON2ID) ]); $newUserRow->save(); } @@ -18,7 +18,7 @@ else // Create default user "admin" with password "admin" $newUserRow = $db->users()->createRow([ 'username' => 'admin', - 'password' => password_hash('admin', PASSWORD_DEFAULT) + 'password' => password_hash('admin', PASSWORD_ARGON2ID) ]); $newUserRow->save(); } diff --git a/services/UsersService.php b/services/UsersService.php index f8bcdc5b..17899028 100644 --- a/services/UsersService.php +++ b/services/UsersService.php @@ -12,7 +12,7 @@ class UsersService extends BaseService 'username' => $username, 'first_name' => $firstName, 'last_name' => $lastName, - 'password' => password_hash($password, PASSWORD_DEFAULT), + 'password' => password_hash($password, PASSWORD_ARGON2ID), 'picture_file_name' => $pictureFileName ]); $newUserRow = $newUserRow->save(); @@ -61,7 +61,7 @@ class UsersService extends BaseService 'username' => $username, 'first_name' => $firstName, 'last_name' => $lastName, - 'password' => password_hash($password, PASSWORD_DEFAULT), + 'password' => password_hash($password, PASSWORD_ARGON2ID), 'picture_file_name' => $pictureFileName ]); }