banananetwork
/
tt-rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

auth_internal: fix indents

Browse Source
master
Andrew Dolgov 5 years ago
parent 249130e58d
commit 812a6c9f16
2 changed files with 190 additions and 191 deletions
Show Stats Download Patch File Download Diff File

1
classes/pref/prefs.php
Unescape Escape View File

@ -986,7 +986,6 @@ class Pref_Prefs extends Handler_Protected {
$sth->execute([$_SESSION['uid']]); $sth->execute([$_SESSION['uid']]);
if ($row = $sth->fetch()) { if ($row = $sth->fetch()) {
$secret = $this->otpsecret(); $secret = $this->otpsecret();
$login = $row['login']; $login = $row['login'];

380
plugins/auth_internal/init.php
Unescape Escape View File

@ -1,168 +1,157 @@
<?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, $service = '') { 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) {
$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 = ?");
$sth->execute([$login]); $sth->execute([$login]);
if ($row = $sth->fetch()) { if ($row = $sth->fetch()) {
$base32 = new \OTPHP\Base32(); $base32 = new \OTPHP\Base32();
$otp_enabled = $row['otp_enabled']; $otp_enabled = $row['otp_enabled'];
$secret = $base32->encode(mb_substr(sha1($row["salt"]), 0, 12), false); $secret = $base32->encode(mb_substr(sha1($row["salt"]), 0, 12), false);
$topt = new \OTPHP\TOTP($secret); $topt = new \OTPHP\TOTP($secret);
$otp_check = $topt->now(); $otp_check = $topt->now();
if ($otp_enabled) { if ($otp_enabled) {
// only allow app password checking if OTP is enabled // only allow app password checking if OTP is enabled
if ($service && get_schema_version() > 138) { if ($service && get_schema_version() > 138) {
return $this->check_app_password($login, $password, $service); return $this->check_app_password($login, $password, $service);
} }
if ($otp) { if ($otp) {
if ($otp != $otp_check) { if ($otp != $otp_check) {
return false; return false;
}
} else {
$return = urlencode($_REQUEST["return"]);
?>
<!DOCTYPE html>
<html>
<head>
<title>Tiny Tiny RSS</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<?php echo stylesheet_tag("css/default.css") ?>
<body class="ttrss_utility otp">
<h1><?php echo __("Authentication") ?></h1>
<div class="content">
<form action="public.php?return=<?php echo $return ?>"
method="POST" class="otpform">
<input type="hidden" name="op" value="login">
<input type="hidden" name="login" value="<?php echo htmlspecialchars($login) ?>">
<input type="hidden" name="password" value="<?php echo htmlspecialchars($password) ?>">
<input type="hidden" name="bw_limit" value="<?php echo htmlspecialchars($_POST["bw_limit"]) ?>">
<input type="hidden" name="remember_me" value="<?php echo htmlspecialchars($_POST["remember_me"]) ?>">
<input type="hidden" name="profile" value="<?php echo htmlspecialchars($_POST["profile"]) ?>">
<fieldset>
<label><?php echo __("Please enter your one time password:") ?></label>
<input autocomplete="off" size="6" name="otp" value=""/>
<input type="submit" value="Continue"/>
</fieldset>
</form></div>
<script type="text/javascript">
document.forms[0].otp.focus();
</script>
<?php
exit;
} }
} else {
$return = urlencode($_REQUEST["return"]);
?>
<!DOCTYPE html>
<html>
<head>
<title>Tiny Tiny RSS</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<?php echo stylesheet_tag("css/default.css") ?>
<body class="ttrss_utility otp">
<h1><?php echo __("Authentication") ?></h1>
<div class="content">
<form action="public.php?return=<?php echo $return ?>"
method="POST" class="otpform">
<input type="hidden" name="op" value="login">
<input type="hidden" name="login" value="<?php echo htmlspecialchars($login) ?>">
<input type="hidden" name="password" value="<?php echo htmlspecialchars($password) ?>">
<input type="hidden" name="bw_limit" value="<?php echo htmlspecialchars($_POST["bw_limit"]) ?>">
<input type="hidden" name="remember_me" value="<?php echo htmlspecialchars($_POST["remember_me"]) ?>">
<input type="hidden" name="profile" value="<?php echo htmlspecialchars($_POST["profile"]) ?>">
<fieldset>
<label><?php echo __("Please enter your one time password:") ?></label>
<input autocomplete="off" size="6" name="otp" value=""/>
<input type="submit" value="Continue"/>
</fieldset>
</form></div>
<script type="text/javascript">
document.forms[0].otp.focus();
</script>
<?php
exit;
} }
} }
} }
}
// check app passwords first but allow regular password as a fallback for the time being // check app passwords first but allow regular password as a fallback for the time being
// if OTP is not enabled // if OTP is not enabled
if ($service && get_schema_version() > 138) { if ($service && get_schema_version() > 138) {
$user_id = $this->check_app_password($login, $password, $service); $user_id = $this->check_app_password($login, $password, $service);
if ($user_id) if ($user_id)
return $user_id; return $user_id;
} }
if (get_schema_version() > 87) {
$sth = $this->pdo->prepare("SELECT salt FROM ttrss_users WHERE login = ?"); if (get_schema_version() > 87) {
$sth->execute([$login]);
if ($row = $sth->fetch()) { $sth = $this->pdo->prepare("SELECT salt FROM ttrss_users WHERE login = ?");
$salt = $row['salt']; $sth->execute([$login]);
if ($salt == "") { if ($row = $sth->fetch()) {
$salt = $row['salt'];
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE if ($salt == "") {
login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
$sth->execute([$login, $pwd_hash1, $pwd_hash2]); $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
// verify and upgrade password to new salt base $sth->execute([$login, $pwd_hash1, $pwd_hash2]);
if ($row = $sth->fetch()) { // verify and upgrade password to new salt base
// upgrade password to MODE2
$user_id = $row['id']; if ($row = $sth->fetch()) {
// upgrade password to MODE2
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250); $user_id = $row['id'];
$pwd_hash = encrypt_password($password, $salt, true);
$sth = $this->pdo->prepare("UPDATE ttrss_users SET $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
pwd_hash = ?, salt = ? WHERE login = ?"); $pwd_hash = encrypt_password($password, $salt, true);
$sth->execute([$pwd_hash, $salt, $login]); $sth = $this->pdo->prepare("UPDATE ttrss_users SET
pwd_hash = ?, salt = ? WHERE login = ?");
return $user_id; $sth->execute([$pwd_hash, $salt, $login]);
} else { return $user_id;
return false;
}
} else { } else {
$pwd_hash = encrypt_password($password, $salt, true); return false;
$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 {
$sth = $this->pdo->prepare("SELECT id $pwd_hash = encrypt_password($password, $salt, true);
FROM ttrss_users WHERE
login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
$sth->execute([$login, $pwd_hash1, $pwd_hash2]); $sth = $this->pdo->prepare("SELECT id
FROM ttrss_users WHERE
login = ? AND pwd_hash = ?");
$sth->execute([$login, $pwd_hash]);
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]);
@ -170,121 +159,132 @@
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'];
}
} }
function check_password($owner_uid, $password) { return false;
}
$sth = $this->pdo->prepare("SELECT salt,login,otp_enabled FROM ttrss_users WHERE function check_password($owner_uid, $password) {
id = ?");
$sth->execute([$owner_uid]);
if ($row = $sth->fetch()) { $sth = $this->pdo->prepare("SELECT salt,login,otp_enabled FROM ttrss_users WHERE
id = ?");
$sth->execute([$owner_uid]);
$salt = $row['salt']; if ($row = $sth->fetch()) {
$login = $row['login'];
if (!$salt) { $salt = $row['salt'];
$password_hash1 = encrypt_password($password); $login = $row['login'];
$password_hash2 = encrypt_password($password, $login);
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE if (!$salt) {
id = ? AND (pwd_hash = ? OR pwd_hash = ?)"); $password_hash1 = encrypt_password($password);
$password_hash2 = encrypt_password($password, $login);
$sth->execute([$owner_uid, $password_hash1, $password_hash2]); $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
id = ? AND (pwd_hash = ? OR pwd_hash = ?)");
return $sth->fetch(); $sth->execute([$owner_uid, $password_hash1, $password_hash2]);
} else { return $sth->fetch();
$password_hash = encrypt_password($password, $salt, true);
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE } else {
id = ? AND pwd_hash = ?"); $password_hash = encrypt_password($password, $salt, true);
$sth->execute([$owner_uid, $password_hash]); $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
id = ? AND pwd_hash = ?");
return $sth->fetch(); $sth->execute([$owner_uid, $password_hash]);
}
}
return false; return $sth->fetch();
}
} }
function change_password($owner_uid, $old_password, $new_password) { return false;
}
if ($this->check_password($owner_uid, $old_password)) { function change_password($owner_uid, $old_password, $new_password) {
$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250); if ($this->check_password($owner_uid, $old_password)) {
$new_password_hash = encrypt_password($new_password, $new_salt, true);
$sth = $this->pdo->prepare("UPDATE ttrss_users SET $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
pwd_hash = ?, salt = ?, otp_enabled = false $new_password_hash = encrypt_password($new_password, $new_salt, true);
WHERE id = ?");
$sth->execute([$new_password_hash, $new_salt, $owner_uid]);
$_SESSION["pwd_hash"] = $new_password_hash; $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]);
$sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?"); $_SESSION["pwd_hash"] = $new_password_hash;
$sth->execute([$owner_uid]);
if ($row = $sth->fetch()) { $sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?");
$mailer = new Mailer(); $sth->execute([$owner_uid]);
require_once "lib/MiniTemplator.class.php"; if ($row = $sth->fetch()) {
$mailer = new Mailer();
$tpl = new MiniTemplator; require_once "lib/MiniTemplator.class.php";
$tpl->readTemplateFromFile("templates/password_change_template.txt"); $tpl = new MiniTemplator;
$tpl->setVariable('LOGIN', $row["login"]); $tpl->readTemplateFromFile("templates/password_change_template.txt");
$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
$tpl->addBlock('message'); $tpl->setVariable('LOGIN', $row["login"]);
$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
$tpl->generateOutputToString($message); $tpl->addBlock('message');
$mailer->mail(["to_name" => $row["login"], $tpl->generateOutputToString($message);
"to_address" => $row["email"],
"subject" => "[tt-rss] Password change notification",
"message" => $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.');
} }
return __("Password has been changed.");
} else {
return "ERROR: ".__('Old password is incorrect.');
} }
}
private function check_app_password($login, $password, $service) { private function check_app_password($login, $password, $service) {
$sth = $this->pdo->prepare("SELECT p.id, p.pwd_hash, u.id AS uid $sth = $this->pdo->prepare("SELECT p.id, p.pwd_hash, u.id AS uid
FROM ttrss_app_passwords p, ttrss_users u FROM ttrss_app_passwords p, ttrss_users u
WHERE p.owner_uid = u.id AND u.login = ? AND service = ?"); WHERE p.owner_uid = u.id AND u.login = ? AND service = ?");
$sth->execute([$login, $service]); $sth->execute([$login, $service]);
while ($row = $sth->fetch()) { while ($row = $sth->fetch()) {
list ($algo, $hash, $salt) = explode(":", $row["pwd_hash"]); list ($algo, $hash, $salt) = explode(":", $row["pwd_hash"]);
if ($algo == "SSHA-512") { if ($algo == "SSHA-512") {
$test_hash = hash('sha512', $salt . $password); $test_hash = hash('sha512', $salt . $password);
if ($test_hash == $hash) { if ($test_hash == $hash) {
$usth = $this->pdo->prepare("UPDATE ttrss_app_passwords SET last_used = NOW() WHERE id = ?"); $usth = $this->pdo->prepare("UPDATE ttrss_app_passwords SET last_used = NOW() WHERE id = ?");
$usth->execute([$row['id']]); $usth->execute([$row['id']]);
return $row['uid']; return $row['uid'];
}
} else {
user_error("Got unknown algo of app password for user $login: $algo");
} }
} else {
user_error("Got unknown algo of app password for user $login: $algo");
} }
return false;
} }
function api_version() { return false;
return 2; }
}
function api_version() {
return 2;
} }
}

Write Preview
Loading…
Cancel
Save