public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 08:35:55 +00:00
Code Issues Releases Wiki Activity

fix hierarchy of authentication modules, make everything extend Auth_Base and implement hook_auth_user() for pluginhost

Browse Source
This commit is contained in:
Andrew Dolgov
2021-02-08 19:11:31 +03:00
parent fc2e0bf67b
commit 51d2deeea9
5 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/auth_internal/init.php
View File

@@ -1,5 +1,5 @@
<?php
class Auth_Internal extends Plugin implements IAuthModule {
class Auth_Internal extends Auth_Base {
private $host;
@@ -13,7 +13,6 @@ class Auth_Internal extends Plugin implements IAuthModule {
/* @var PluginHost $host */
function init($host) {
$this->host = $host;
$this->pdo = Db::pdo();
$host->add_hook($host::HOOK_AUTH_USER, $this);
}
@@ -178,7 +177,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
return false;
}
function check_password($owner_uid, $password) {
function check_password($owner_uid, $password, $service = '') {
$sth = $this->pdo->prepare("SELECT salt,login,otp_enabled FROM ttrss_users WHERE
id = ?");
@@ -189,6 +188,11 @@ class Auth_Internal extends Plugin implements IAuthModule {
$salt = $row['salt'];
$login = $row['login'];
// check app password only if service is specified
if ($service && get_schema_version() > 138) {
return $this->check_app_password($login, $password, $service);
}
if (!$salt) {
$password_hash1 = encrypt_password($password);
$password_hash2 = encrypt_password($password, $login);