mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-01-17 10:08:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Factorized code for confirmation key matching

Browse source
This commit is contained in:
Sylvain Berfini 2019-08-21 17:40:42 +02:00
parent 0f24b04ba9
commit 8a7e6ccc81
4 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
conf/db.conf
View file

@ -92,4 +92,11 @@ define("USER_INFO_DB_TABLE", "user_info");
*/
define("EXPIRATION_DELAY", 180);
/*
* The value to use in the database after a one time confirmation has been used
*
* Default value: ERROR
*/
define ("INVALID_CONFIRMATION_KEY", "ERROR");
?>

16
src/misc/utilities.php
View file

@ -19,7 +19,9 @@
*/
include_once __DIR__ . '/../config/config.php';
include_once __DIR__ . '/../objects/account.php';
include_once __DIR__ . '/logging.php';
if (EMAIL_ENABLED) {
include_once __DIR__ . '/email.php';
}
@ -123,6 +125,20 @@ function password_match($pwd1, $pwd2) {
return true;
}
function is_key_matching($key, $account) {
$key_db = $account->confirmation_key;
if ($key == INVALID_CONFIRMATION_KEY || $key != $key_db) {
if ($key_db != INVALID_CONFIRMATION_KEY) {
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
}
Logger::getInstance()->error("Key doesn't match");
return false;
}
return true;
}
// Time
function time_elapsed_as_string($secs) {

30
src/xmlrpc/accounts.php
View file

@ -29,8 +29,6 @@ include_once __DIR__ . '/../misc/utilities.php';
include_once __DIR__ . '/results_values.php';
define ("INVALID_CONFIRMATION_KEY", "ERROR");
// args = [user, pwd, [domain], [algo]]
// /!\ This method must be used for tests purposes only /!\
function xmlrpc_get_confirmation_key($method, $args) {
@ -259,17 +257,9 @@ function xmlrpc_activate_phone_account($method, $args) {
return ACCOUNT_NOT_FOUND;
}
$key_db = $account->confirmation_key;
if ($key == INVALID_CONFIRMATION_KEY || $key != $key_db) {
if ($key_db != INVALID_CONFIRMATION_KEY) {
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
}
Logger::getInstance()->error("Key doesn't match");
if (!is_key_matching($key, $account)) {
return KEY_DOESNT_MATCH;
}
// Key is one time only
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
@ -445,13 +435,7 @@ function xmlrpc_activate_email_account($method, $args) {
return ACCOUNT_ALREADY_ACTIVATED;
}
$key_db = $account->confirmation_key;
if ($key == INVALID_CONFIRMATION_KEY || $key != $key_db) {
if ($key_db != INVALID_CONFIRMATION_KEY) {
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
}
Logger::getInstance()->error("Key doesn't match");
if (!is_key_matching($key, $account)) {
return KEY_DOESNT_MATCH;
}
@ -706,17 +690,9 @@ function xmlrpc_recover_account_from_confirmation_key($method, $args) {
return ACCOUNT_NOT_FOUND;
}
$key_db = $account->confirmation_key;
if ($key == INVALID_CONFIRMATION_KEY || $key != $key_db) {
if ($key_db != INVALID_CONFIRMATION_KEY) {
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
}
Logger::getInstance()->error("Key doesn't match");
if (!is_key_matching($key, $account)) {
return KEY_DOESNT_MATCH;
}
// Key is one time only
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();

6
src/xmlrpc/aliases.php
View file

@ -128,9 +128,13 @@ function xmlrpc_activate_phone_number_link($method, $args) {
if (!is_activated($account->activated)) {
return ACCOUNT_NOT_YET_ACTIVATED;
}
if ($key != $account->confirmation_key) {
if (!is_key_matching($key, $account)) {
return KEY_DOESNT_MATCH;
}
// Key is one time only
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
$password = new Password($db);
$password->account_id = $account->id;