fix password crypt hash being always evaluated to argon2i as the case always returns true if PASSWORD_ARGON2I is defined but the froxlor setting might be set to another hash leading to a useless password
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
@@ -157,10 +157,10 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
|
||||
|
||||
// prefix hash-algo
|
||||
switch (Settings::Get('system.passwordcryptfunc')) {
|
||||
case defined('PASSWORD_ARGON2I') && PASSWORD_ARGON2I:
|
||||
case 'argon2i':
|
||||
$cpPrefix = '{ARGON2I}';
|
||||
break;
|
||||
case defined('PASSWORD_ARGON2ID') && PASSWORD_ARGON2ID:
|
||||
case 'argon2id':
|
||||
$cpPrefix = '{ARGON2ID}';
|
||||
break;
|
||||
default:
|
||||
@@ -404,10 +404,10 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
|
||||
$password = Crypt::validatePassword($password, true);
|
||||
// prefix hash-algo
|
||||
switch (Settings::Get('system.passwordcryptfunc')) {
|
||||
case defined('PASSWORD_ARGON2I') && PASSWORD_ARGON2I:
|
||||
case 'argon2i':
|
||||
$cpPrefix = '{ARGON2I}';
|
||||
break;
|
||||
case defined('PASSWORD_ARGON2ID') && PASSWORD_ARGON2ID:
|
||||
case 'argon2id':
|
||||
$cpPrefix = '{ARGON2ID}';
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user