allow captured password for operationMode=local as well

This commit is contained in:
2018-05-28 10:29:41 +02:00
parent a8903dcf9a
commit 9a93b88d11
3 changed files with 18 additions and 15 deletions

View File

@@ -72,16 +72,16 @@ try {
$password = NULL;
$use_db_password = (isset($config["getPasswordOnRegistration"]) && $config["getPasswordOnRegistration"]);
if ($use_db_password && isset($user["password"]) && strlen($user["password"]) > 0) {
$password = $user["password"];
} else {
$use_db_password = false;
// generate a password with 10 characters
$password = bin2hex(openssl_random_pseudo_bytes(5));
}
switch ($config["operationMode"]) {
case "synapse":
// register with registration_shared_secret
if ($use_db_password && isset($user["password"]) && strlen($user["password"]) > 0) {
$password = $user["password"];
} else {
$use_db_password = false;
// generate a password with 10 characters
$password = bin2hex(openssl_random_pseudo_bytes(5));
}
$res = $mxConn->register($username, $password, $config["registration_shared_secret"]);
if (!$res) {
// something went wrong while registering
@@ -90,8 +90,7 @@ try {
break;
case "local":
// register by adding a user to the local database
$use_db_password = false; // requires restructure to use db-provided pw
$password = $mx_db->addUser($first_name, $last_name, $username, $email);
$password = $mx_db->addUser($first_name, $last_name, $username, $password, $email);
break;
default:
throw new Exception("Unknown operationMode");