|
|
|
@ -15,13 +15,14 @@ abstract class Auth_Base extends Plugin implements IAuthModule {
|
|
|
|
|
|
|
|
|
|
// Auto-creates specified user if allowed by system configuration
|
|
|
|
|
// Can be used instead of find_user_by_login() by external auth modules
|
|
|
|
|
function auto_create_user($login, $password = false) {
|
|
|
|
|
function auto_create_user(string $login, $password = false) {
|
|
|
|
|
if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
|
|
|
|
|
$user_id = $this->find_user_by_login($login);
|
|
|
|
|
$user_id = UserHelper::find_user_by_login($login);
|
|
|
|
|
|
|
|
|
|
if (!$user_id) {
|
|
|
|
|
|
|
|
|
|
if (!$password) $password = make_password();
|
|
|
|
|
|
|
|
|
|
if (!$user_id) {
|
|
|
|
|
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
|
|
|
|
|
$pwd_hash = encrypt_password($password, $salt, true);
|
|
|
|
|
|
|
|
|
@ -30,26 +31,18 @@ abstract class Auth_Base extends Plugin implements IAuthModule {
|
|
|
|
|
VALUES (LOWER(?), 0, null, NOW(), ?,?)");
|
|
|
|
|
$sth->execute([$login, $pwd_hash, $salt]);
|
|
|
|
|
|
|
|
|
|
return $this->find_user_by_login($login);
|
|
|
|
|
return UserHelper::find_user_by_login($login);
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
return $user_id;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return $this->find_user_by_login($login);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function find_user_by_login($login) {
|
|
|
|
|
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
|
|
|
|
|
LOWER(login) = LOWER(?)");
|
|
|
|
|
$sth->execute([$login]);
|
|
|
|
|
|
|
|
|
|
if ($row = $sth->fetch()) {
|
|
|
|
|
return $row["id"];
|
|
|
|
|
} else {
|
|
|
|
|
return false;
|
|
|
|
|
return UserHelper::find_user_by_login($login);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// @deprecated
|
|
|
|
|
function find_user_by_login(string $login) {
|
|
|
|
|
return UserHelper::find_user_by_login($login);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|