paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor support for pre-hashed passwords (#4024)

master
Shea Ramage 2021-03-10 15:06:32 -05:00 committed by GitHub
parent 43146b23c9
commit 4feceb08da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/web/inc/functions.inc.php
View File

@ -88,6 +88,11 @@ function hash_password($password) {
// in case default pass scheme is not defined, falling back to BLF-CRYPT. // in case default pass scheme is not defined, falling back to BLF-CRYPT.
global $default_pass_scheme; global $default_pass_scheme;
$pw_hash = NULL; $pw_hash = NULL;
// support pre-hashed passwords
if (preg_match('/^{(ARGON2I|ARGON2ID|BLF-CRYPT|CLEAR|CLEARTEXT|CRYPT|DES-CRYPT|LDAP-MD5|MD5|MD5-CRYPT|PBKDF2|PLAIN|PLAIN-MD4|PLAIN-MD5|PLAIN-TRUNC|PLAIN-TRUNC|SHA|SHA1|SHA256|SHA256-CRYPT|SHA512|SHA512-CRYPT|SMD5|SSHA|SSHA256|SSHA512)}/i', $password)) {
$pw_hash = $password;
}
else {
switch (strtoupper($default_pass_scheme)) { switch (strtoupper($default_pass_scheme)) {
case "SSHA": case "SSHA":
$salt_str = bin2hex(openssl_random_pseudo_bytes(8)); $salt_str = bin2hex(openssl_random_pseudo_bytes(8));
@ -106,6 +111,7 @@ function hash_password($password) {
$pw_hash = "{BLF-CRYPT}" . password_hash($password, PASSWORD_BCRYPT); $pw_hash = "{BLF-CRYPT}" . password_hash($password, PASSWORD_BCRYPT);
break; break;
} }
}
return $pw_hash; return $pw_hash;
} }
function last_login($user) { function last_login($user) {

6
data/web/inc/functions.mailbox.inc.php
View File

@ -1062,14 +1062,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
); );
return false; return false;
} }
// support pre hashed passwords
if (preg_match('/^{(ARGON2I|ARGON2ID|BLF-CRYPT|CLEAR|CLEARTEXT|CRYPT|DES-CRYPT|LDAP-MD5|MD5|MD5-CRYPT|PBKDF2|PLAIN|PLAIN-MD4|PLAIN-MD5|PLAIN-TRUNC|PLAIN-TRUNC|SHA|SHA1|SHA256|SHA256-CRYPT|SHA512|SHA512-CRYPT|SMD5|SSHA|SSHA256|SSHA512)}/i', $password)) {
$password_hashed = $password;
}
else {
$password_hashed = hash_password($password); $password_hashed = hash_password($password);
} }
}
else { else {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',