valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add placeholder authentication via app passwords if service is passed 

forbid logins via regular passwords for services
remove AUTH_DISABLE_OTP
This commit is contained in:
Andrew Dolgov 2019-11-01 13:03:06 +03:00
parent 88cd9e586e
commit 68b0380118
6 changed files with 160 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/index.php
View File

@ -22,8 +22,6 @@
ini_set('session.use_cookies', 0); ini_set('session.use_cookies', 0);
ini_set("session.gc_maxlifetime", 86400); ini_set("session.gc_maxlifetime", 86400);
define('AUTH_DISABLE_OTP', true);
if (defined('ENABLE_GZIP_OUTPUT') && ENABLE_GZIP_OUTPUT && if (defined('ENABLE_GZIP_OUTPUT') && ENABLE_GZIP_OUTPUT &&
function_exists("ob_gzhandler")) { function_exists("ob_gzhandler")) {

4
classes/api.php
View File

@ -74,10 +74,10 @@ class API extends Handler {
} }
if (get_pref("ENABLE_API_ACCESS", $uid)) { if (get_pref("ENABLE_API_ACCESS", $uid)) {
if (authenticate_user($login, $password)) { // try login with normal password if (authenticate_user($login, $password, false, Auth_Base::AUTH_SERVICE_API)) { // try login with normal password
$this->wrap(self::STATUS_OK, array("session_id" => session_id(), $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
"api_level" => self::API_LEVEL)); "api_level" => self::API_LEVEL));
} else if (authenticate_user($login, $password_base64)) { // else try with base64_decoded password } else if (authenticate_user($login, $password_base64, false, Auth_Base::AUTH_SERVICE_API)) { // else try with base64_decoded password
$this->wrap(self::STATUS_OK, array("session_id" => session_id(), $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
"api_level" => self::API_LEVEL)); "api_level" => self::API_LEVEL));
} else { // else we are not logged in } else { // else we are not logged in

6
classes/auth/base.php
View File

@ -2,6 +2,8 @@
class Auth_Base { class Auth_Base {
private $pdo; private $pdo;
const AUTH_SERVICE_API = '_api';
function __construct() { function __construct() {
$this->pdo = Db::pdo(); $this->pdo = Db::pdo();
} }
@ -9,14 +11,14 @@ class Auth_Base {
/** /**
* @SuppressWarnings(unused) * @SuppressWarnings(unused)
*/ */
function check_password($owner_uid, $password) { function check_password($owner_uid, $password, $service = '') {
return false; return false;
} }
/** /**
* @SuppressWarnings(unused) * @SuppressWarnings(unused)
*/ */
function authenticate($login, $password) { function authenticate($login, $password, $service = '') {
return false; return false;
} }

2
classes/iauthmodule.php
View File

@ -1,4 +1,4 @@
<?php <?php
interface IAuthModule { interface IAuthModule {
function authenticate($login, $password); function authenticate($login, $password); // + optional third parameter: $service
} }

4
include/functions.php
View File

@ -509,7 +509,7 @@
return ""; return "";
} }
function authenticate_user($login, $password, $check_only = false) { function authenticate_user($login, $password, $check_only = false, $service = false) {
if (!SINGLE_USER_MODE) { if (!SINGLE_USER_MODE) {
$user_id = false; $user_id = false;
@ -517,7 +517,7 @@
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_AUTH_USER) as $plugin) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_AUTH_USER) as $plugin) {
$user_id = (int) $plugin->authenticate($login, $password); $user_id = (int) $plugin->authenticate($login, $password, $service);
if ($user_id) { if ($user_id) {
$auth_module = strtolower(get_class($plugin)); $auth_module = strtolower(get_class($plugin));

285
plugins/auth_internal/init.php
View File

@ -1,31 +1,30 @@
<?php <?php
class Auth_Internal extends Plugin implements IAuthModule { class Auth_Internal extends Plugin implements IAuthModule {
private $host; private $host;
function about() { function about() {
return array(1.0, return array(1.0,
"Authenticates against internal tt-rss database", "Authenticates against internal tt-rss database",
"fox", "fox",
true); true);
} }
/* @var PluginHost $host */ /* @var PluginHost $host */
function init($host) { function init($host) {
$this->host = $host; $this->host = $host;
$this->pdo = Db::pdo(); $this->pdo = Db::pdo();
$host->add_hook($host::HOOK_AUTH_USER, $this); $host->add_hook($host::HOOK_AUTH_USER, $this);
} }
function authenticate($login, $password) { function authenticate($login, $password, $service = '') {
$pwd_hash1 = encrypt_password($password); $pwd_hash1 = encrypt_password($password);
$pwd_hash2 = encrypt_password($password, $login); $pwd_hash2 = encrypt_password($password, $login);
$otp = $_REQUEST["otp"]; $otp = $_REQUEST["otp"];
if (get_schema_version() > 96) { if (get_schema_version() > 96) {
if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
$sth = $this->pdo->prepare("SELECT otp_enabled,salt FROM ttrss_users WHERE $sth = $this->pdo->prepare("SELECT otp_enabled,salt FROM ttrss_users WHERE
login = ?"); login = ?");
@ -42,6 +41,12 @@ class Auth_Internal extends Plugin implements IAuthModule {
$otp_check = $topt->now(); $otp_check = $topt->now();
if ($otp_enabled) { if ($otp_enabled) {
// only allow app password checking if OTP is enabled
if ($service && get_schema_version() > 138) {
return $this->check_app_password($login, $password, $service);
}
if ($otp) { if ($otp) {
if ($otp != $otp_check) { if ($otp != $otp_check) {
return false; return false;
@ -83,61 +88,81 @@ class Auth_Internal extends Plugin implements IAuthModule {
} }
} }
} }
}
if (get_schema_version() > 87) { // check app passwords first but allow regular password as a fallback for the time being
// if OTP is not enabled
$sth = $this->pdo->prepare("SELECT salt FROM ttrss_users WHERE login = ?"); if ($service && get_schema_version() > 138) {
$sth->execute([$login]); $user_id = $this->check_app_password($login, $password, $service);
if ($row = $sth->fetch()) { if ($user_id)
$salt = $row['salt']; return $user_id;
}
if ($salt == "") { if (get_schema_version() > 87) {
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE $sth = $this->pdo->prepare("SELECT salt FROM ttrss_users WHERE login = ?");
login = ? AND (pwd_hash = ? OR pwd_hash = ?)"); $sth->execute([$login]);
$sth->execute([$login, $pwd_hash1, $pwd_hash2]); if ($row = $sth->fetch()) {
$salt = $row['salt'];
// verify and upgrade password to new salt base if ($salt == "") {
if ($row = $sth->fetch()) { $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
// upgrade password to MODE2 login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
$user_id = $row['id']; $sth->execute([$login, $pwd_hash1, $pwd_hash2]);
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250); // verify and upgrade password to new salt base
$pwd_hash = encrypt_password($password, $salt, true);
$sth = $this->pdo->prepare("UPDATE ttrss_users SET if ($row = $sth->fetch()) {
pwd_hash = ?, salt = ? WHERE login = ?"); // upgrade password to MODE2
$sth->execute([$pwd_hash, $salt, $login]); $user_id = $row['id'];
return $user_id; $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($password, $salt, true);
$sth = $this->pdo->prepare("UPDATE ttrss_users SET
pwd_hash = ?, salt = ? WHERE login = ?");
$sth->execute([$pwd_hash, $salt, $login]);
return $user_id;
} else {
return false;
}
} else { } else {
return false; $pwd_hash = encrypt_password($password, $salt, true);
$sth = $this->pdo->prepare("SELECT id
FROM ttrss_users WHERE
login = ? AND pwd_hash = ?");
$sth->execute([$login, $pwd_hash]);
if ($row = $sth->fetch()) {
return $row['id'];
}
} }
} else { } else {
$pwd_hash = encrypt_password($password, $salt, true);
$sth = $this->pdo->prepare("SELECT id $sth = $this->pdo->prepare("SELECT id
FROM ttrss_users WHERE FROM ttrss_users WHERE
login = ? AND pwd_hash = ?"); login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
$sth->execute([$login, $pwd_hash]);
$sth->execute([$login, $pwd_hash1, $pwd_hash2]);
if ($row = $sth->fetch()) { if ($row = $sth->fetch()) {
return $row['id']; return $row['id'];
} }
} }
} else { } else {
$sth = $this->pdo->prepare("SELECT id $sth = $this->pdo->prepare("SELECT id
FROM ttrss_users WHERE FROM ttrss_users WHERE
login = ? AND (pwd_hash = ? OR pwd_hash = ?)"); login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
$sth->execute([$login, $pwd_hash1, $pwd_hash2]); $sth->execute([$login, $pwd_hash1, $pwd_hash2]);
@ -145,107 +170,99 @@ class Auth_Internal extends Plugin implements IAuthModule {
return $row['id']; return $row['id'];
} }
} }
} else {
$sth = $this->pdo->prepare("SELECT id
FROM ttrss_users WHERE
login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
$sth->execute([$login, $pwd_hash1, $pwd_hash2]); return false;
if ($row = $sth->fetch()) {
return $row['id'];
}
}
return false;
}
function check_password($owner_uid, $password) {
$sth = $this->pdo->prepare("SELECT salt,login FROM ttrss_users WHERE
id = ?");
$sth->execute([$owner_uid]);
if ($row = $sth->fetch()) {
$salt = $row['salt'];
$login = $row['login'];
if (!$salt) {
$password_hash1 = encrypt_password($password);
$password_hash2 = encrypt_password($password, $login);
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
id = ? AND (pwd_hash = ? OR pwd_hash = ?)");
$sth->execute([$owner_uid, $password_hash1, $password_hash2]);
return $sth->fetch();
} else {
$password_hash = encrypt_password($password, $salt, true);
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
id = ? AND pwd_hash = ?");
$sth->execute([$owner_uid, $password_hash]);
return $sth->fetch();
}
} }
return false; function check_password($owner_uid, $password) {
}
function change_password($owner_uid, $old_password, $new_password) { $sth = $this->pdo->prepare("SELECT salt,login,otp_enabled FROM ttrss_users WHERE
id = ?");
if ($this->check_password($owner_uid, $old_password)) {
$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$new_password_hash = encrypt_password($new_password, $new_salt, true);
$sth = $this->pdo->prepare("UPDATE ttrss_users SET
pwd_hash = ?, salt = ?, otp_enabled = false
WHERE id = ?");
$sth->execute([$new_password_hash, $new_salt, $owner_uid]);
$_SESSION["pwd_hash"] = $new_password_hash;
$sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?");
$sth->execute([$owner_uid]); $sth->execute([$owner_uid]);
if ($row = $sth->fetch()) { if ($row = $sth->fetch()) {
$mailer = new Mailer();
require_once "lib/MiniTemplator.class.php"; $salt = $row['salt'];
$login = $row['login'];
$tpl = new MiniTemplator; if (!$salt) {
$password_hash1 = encrypt_password($password);
$password_hash2 = encrypt_password($password, $login);
$tpl->readTemplateFromFile("templates/password_change_template.txt"); $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
id = ? AND (pwd_hash = ? OR pwd_hash = ?)");
$tpl->setVariable('LOGIN', $row["login"]); $sth->execute([$owner_uid, $password_hash1, $password_hash2]);
$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
$tpl->addBlock('message'); return $sth->fetch();
$tpl->generateOutputToString($message); } else {
$password_hash = encrypt_password($password, $salt, true);
$mailer->mail(["to_name" => $row["login"], $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
"to_address" => $row["email"], id = ? AND pwd_hash = ?");
"subject" => "[tt-rss] Password change notification",
"message" => $message]);
$sth->execute([$owner_uid, $password_hash]);
return $sth->fetch();
}
} }
return __("Password has been changed."); return false;
} else {
return "ERROR: ".__('Old password is incorrect.');
} }
}
function api_version() { function change_password($owner_uid, $old_password, $new_password) {
return 2;
}
} if ($this->check_password($owner_uid, $old_password)) {
?>
$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$new_password_hash = encrypt_password($new_password, $new_salt, true);
$sth = $this->pdo->prepare("UPDATE ttrss_users SET
pwd_hash = ?, salt = ?, otp_enabled = false
WHERE id = ?");
$sth->execute([$new_password_hash, $new_salt, $owner_uid]);
$_SESSION["pwd_hash"] = $new_password_hash;
$sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?");
$sth->execute([$owner_uid]);
if ($row = $sth->fetch()) {
$mailer = new Mailer();
require_once "lib/MiniTemplator.class.php";
$tpl = new MiniTemplator;
$tpl->readTemplateFromFile("templates/password_change_template.txt");
$tpl->setVariable('LOGIN', $row["login"]);
$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
$tpl->addBlock('message');
$tpl->generateOutputToString($message);
$mailer->mail(["to_name" => $row["login"],
"to_address" => $row["email"],
"subject" => "[tt-rss] Password change notification",
"message" => $message]);
}
return __("Password has been changed.");
} else {
return "ERROR: ".__('Old password is incorrect.');
}
}
private function check_app_password($login, $password, $service) {
return false;
}
function api_version() {
return 2;
}
}