maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

display which is the default password-hash; fix language selection on login

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-08-26 16:07:40 +02:00
parent f47d203215
commit 05634adc66
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/210.security.php
View File

@@ -53,7 +53,7 @@ return [
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'passwordcryptfunc', 'varname' => 'passwordcryptfunc',
'type' => 'select', 'type' => 'select',
'default' => 0, 'default' => PASSWORD_DEFAULT,
'option_options_method' => [ 'option_options_method' => [
'\\Froxlor\\System\\Crypt', '\\Froxlor\\System\\Crypt',
'getAvailablePasswordHashes' 'getAvailablePasswordHashes'

2
index.php
View File

@@ -40,6 +40,7 @@ use Froxlor\UI\Panel\UI;
use Froxlor\UI\Response; use Froxlor\UI\Response;
use Froxlor\User; use Froxlor\User;
use Froxlor\Validate\Validate; use Froxlor\Validate\Validate;
use Froxlor\Language;
if ($action == '') { if ($action == '') {
$action = 'login'; $action = 'login';
@@ -119,6 +120,7 @@ if ($action == '2fa_entercode') {
]); ]);
exit(); exit();
} elseif ($action == 'login') { } elseif ($action == 'login') {
$languages = Language::getLanguages();
if (isset($_POST['send']) && $_POST['send'] == 'send') { if (isset($_POST['send']) && $_POST['send'] == 'send') {
$loginname = Validate::validate($_POST['loginname'], 'loginname'); $loginname = Validate::validate($_POST['loginname'], 'loginname');
$password = Validate::validate($_POST['password'], 'password'); $password = Validate::validate($_POST['password'], 'password');

6
lib/Froxlor/System/Crypt.php
View File

@@ -94,13 +94,13 @@ class Crypt
PASSWORD_DEFAULT => lng('serversettings.systemdefault') PASSWORD_DEFAULT => lng('serversettings.systemdefault')
]; ];
if (defined('PASSWORD_BCRYPT')) { if (defined('PASSWORD_BCRYPT')) {
$available_pwdhashes[PASSWORD_BCRYPT] = 'Bcrypt/Blowfish'; $available_pwdhashes[PASSWORD_BCRYPT] = 'Bcrypt/Blowfish' . (PASSWORD_DEFAULT == PASSWORD_BCRYPT ? ' (' . lng('serversettings.systemdefault') . ')' : '');
} }
if (defined('PASSWORD_ARGON2I')) { if (defined('PASSWORD_ARGON2I')) {
$available_pwdhashes[PASSWORD_ARGON2I] = 'Argon2i'; $available_pwdhashes[PASSWORD_ARGON2I] = 'Argon2i' . (PASSWORD_DEFAULT == PASSWORD_ARGON2I ? ' (' . lng('serversettings.systemdefault') . ')' : '');
} }
if (defined('PASSWORD_ARGON2ID')) { if (defined('PASSWORD_ARGON2ID')) {
$available_pwdhashes[PASSWORD_ARGON2ID] = 'Argon2id'; $available_pwdhashes[PASSWORD_ARGON2ID] = 'Argon2id' . (PASSWORD_DEFAULT == PASSWORD_ARGON2ID ? ' (' . lng('serversettings.systemdefault') . ')' : '');
} }
return $available_pwdhashes; return $available_pwdhashes;