mirror of
https://github.com/grocy/grocy.git
synced 2026-03-28 07:39:25 +01:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f32d0bb28d | ||
|
|
23af6adcee |
|
|
@ -15,5 +15,5 @@ if ($adminUserRow == null)
|
||||||
}
|
}
|
||||||
|
|
||||||
$adminUserRow->update([
|
$adminUserRow->update([
|
||||||
'password' => password_hash('admin', PASSWORD_DEFAULT)
|
'password' => password_hash('admin', PASSWORD_ARGON2ID)
|
||||||
]);
|
]);
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
root = true
|
|
||||||
|
|
||||||
[*]
|
|
||||||
indent_style = tab
|
|
||||||
indent_size = 4
|
|
||||||
charset = utf-8
|
|
||||||
trim_trailing_whitespace = true
|
|
||||||
insert_final_newline = true
|
|
||||||
|
|
@ -40,10 +40,10 @@ class DefaultAuthMiddleware extends AuthMiddleware
|
||||||
$sessionKey = SessionService::getInstance()->CreateSession($user->id, $stayLoggedInPermanently);
|
$sessionKey = SessionService::getInstance()->CreateSession($user->id, $stayLoggedInPermanently);
|
||||||
self::SetSessionCookie($sessionKey);
|
self::SetSessionCookie($sessionKey);
|
||||||
|
|
||||||
if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
|
if (password_needs_rehash($user->password, PASSWORD_ARGON2ID))
|
||||||
{
|
{
|
||||||
$user->update([
|
$user->update([
|
||||||
'password' => password_hash($inputPassword, PASSWORD_DEFAULT)
|
'password' => password_hash($inputPassword, PASSWORD_ARGON2ID)
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ if (defined('GROCY_HTTP_USER'))
|
||||||
// Migrate old user defined in config file to database
|
// Migrate old user defined in config file to database
|
||||||
$newUserRow = $db->users()->createRow([
|
$newUserRow = $db->users()->createRow([
|
||||||
'username' => GROCY_HTTP_USER,
|
'username' => GROCY_HTTP_USER,
|
||||||
'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_DEFAULT)
|
'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_ARGON2ID)
|
||||||
]);
|
]);
|
||||||
$newUserRow->save();
|
$newUserRow->save();
|
||||||
}
|
}
|
||||||
|
|
@ -18,7 +18,7 @@ else
|
||||||
// Create default user "admin" with password "admin"
|
// Create default user "admin" with password "admin"
|
||||||
$newUserRow = $db->users()->createRow([
|
$newUserRow = $db->users()->createRow([
|
||||||
'username' => 'admin',
|
'username' => 'admin',
|
||||||
'password' => password_hash('admin', PASSWORD_DEFAULT)
|
'password' => password_hash('admin', PASSWORD_ARGON2ID)
|
||||||
]);
|
]);
|
||||||
$newUserRow->save();
|
$newUserRow->save();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ class UsersService extends BaseService
|
||||||
'username' => $username,
|
'username' => $username,
|
||||||
'first_name' => $firstName,
|
'first_name' => $firstName,
|
||||||
'last_name' => $lastName,
|
'last_name' => $lastName,
|
||||||
'password' => password_hash($password, PASSWORD_DEFAULT),
|
'password' => password_hash($password, PASSWORD_ARGON2ID),
|
||||||
'picture_file_name' => $pictureFileName
|
'picture_file_name' => $pictureFileName
|
||||||
]);
|
]);
|
||||||
$newUserRow = $newUserRow->save();
|
$newUserRow = $newUserRow->save();
|
||||||
|
|
@ -61,7 +61,7 @@ class UsersService extends BaseService
|
||||||
'username' => $username,
|
'username' => $username,
|
||||||
'first_name' => $firstName,
|
'first_name' => $firstName,
|
||||||
'last_name' => $lastName,
|
'last_name' => $lastName,
|
||||||
'password' => password_hash($password, PASSWORD_DEFAULT),
|
'password' => password_hash($password, PASSWORD_ARGON2ID),
|
||||||
'picture_file_name' => $pictureFileName
|
'picture_file_name' => $pictureFileName
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user