valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ttrss/plugins/auth_internal/init.php

221 lines
5.8 KiB
PHP
Raw Normal View History

split authentication to separate modules
2012-08-16 11:30:35 +00:00
<?php
move authentication modules to plugins/
2012-12-27 11:14:44 +00:00
class Auth_Internal extends Plugin implements IAuthModule {
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
move authentication modules to plugins/
2012-12-27 11:14:44 +00:00
private $host;
function about() {
return array(1.0,
"Authenticates against internal tt-rss database",
"fox",
true);
}
auth_remote: use PDO
2017-12-03 06:21:08 +00:00
/* @var PluginHost $host */
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
function init($host) {
move authentication modules to plugins/
2012-12-27 11:14:44 +00:00
$this->host = $host;
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$this->pdo = Db::pdo();
move authentication modules to plugins/
2012-12-27 11:14:44 +00:00
$host->add_hook($host::HOOK_AUTH_USER, $this);
}
split authentication to separate modules
2012-08-16 11:30:35 +00:00
function authenticate($login, $password) {
$pwd_hash1 = encrypt_password($password);
$pwd_hash2 = encrypt_password($password, $login);
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$otp = $_REQUEST["otp"];
implement one time passwords using TOTP
2012-09-03 14:33:46 +00:00
remove $link
2013-04-17 12:23:15 +00:00
if (get_schema_version() > 96) {
Revert "only enable OTPHP on php version 5.3+" This reverts commit 1835f145a8f4d450e33b15faf7d50437731a8793.
2012-09-15 13:17:44 +00:00
if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
initial
2013-04-17 17:19:00 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth = $this->pdo->prepare("SELECT otp_enabled,salt FROM ttrss_users WHERE
login = ?");
$sth->execute([$login]);
api: add workaround to disable OTP
2012-09-03 18:32:24 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
if ($row = $sth->fetch()) {
initial
2013-04-17 17:19:00 +00:00
api: add workaround to disable OTP
2012-09-03 18:32:24 +00:00
require_once "lib/otphp/vendor/base32.php";
require_once "lib/otphp/lib/otp.php";
require_once "lib/otphp/lib/totp.php";
$base32 = new Base32();
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$otp_enabled = $row['otp_enabled'];
$secret = $base32->encode(sha1($row['salt']));
api: add workaround to disable OTP
2012-09-03 18:32:24 +00:00
$topt = new \OTPHP\TOTP($secret);
$otp_check = $topt->now();
if ($otp_enabled) {
if ($otp) {
if ($otp != $otp_check) {
return false;
}
} else {
fix OTP
2012-09-10 15:18:44 +00:00
$return = urlencode($_REQUEST["return"]);
api: add workaround to disable OTP
2012-09-03 18:32:24 +00:00
?><html>
<head><title>Tiny Tiny RSS</title></head>
further stylesheet simplification related fixes
2017-12-03 10:25:34 +00:00
<?php echo stylesheet_tag("css/default.css") ?>
<body class="ttrss_utility otp"><div class="content">
fix OTP
2012-09-10 15:18:44 +00:00
<form action="public.php?return=<?php echo $return ?>"
add some styling to otp form
2013-04-16 17:15:41 +00:00
method="POST" class="otpform">
fix OTP
2012-09-10 15:18:44 +00:00
<input type="hidden" name="op" value="login">
api: add workaround to disable OTP
2012-09-03 18:32:24 +00:00
<input type="hidden" name="login" value="<?php echo htmlspecialchars($login) ?>">
<input type="hidden" name="password" value="<?php echo htmlspecialchars($password) ?>">
fix several login parameters not being passed through OTP form
2014-05-03 18:37:08 +00:00
<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"]) ?>">
api: add workaround to disable OTP
2012-09-03 18:32:24 +00:00
<label><?php echo __("Please enter your one time password:") ?></label>
set otp field to autocomplete=off
2013-04-16 16:52:36 +00:00
<input autocomplete="off" size="6" name="otp" value=""/>
api: add workaround to disable OTP
2012-09-03 18:32:24 +00:00
<input type="submit" value="Continue"/>
add some styling to otp form
2013-04-16 17:15:41 +00:00
</form></div>
focus input field in otp form
2012-09-04 08:08:50 +00:00
<script type="text/javascript">
document.forms[0].otp.focus();
</script>
api: add workaround to disable OTP
2012-09-03 18:32:24 +00:00
<?php
exit;
auth internal: fix login screen warning
2012-09-03 14:53:19 +00:00
}
implement one time passwords using TOTP
2012-09-03 14:33:46 +00:00
}
}
}
}
split authentication to separate modules
2012-08-16 11:30:35 +00:00
remove $link
2013-04-17 12:23:15 +00:00
if (get_schema_version() > 87) {
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth = $this->pdo->prepare("SELECT salt FROM ttrss_users WHERE login = ?");
$sth->execute([$login]);
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
if ($row = $sth->fetch()) {
$salt = $row['salt'];
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
if ($salt == "") {
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth->execute([$login, $pwd_hash1, $pwd_hash2]);
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
// verify and upgrade password to new salt base
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
if ($row = $sth->fetch()) {
// upgrade password to MODE2
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$user_id = $row['id'];
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$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 = ?");
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth->execute([$pwd_hash, $salt, $login]);
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
return $user_id;
} else {
return false;
}
split authentication to separate modules
2012-08-16 11:30:35 +00:00
} else {
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$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'];
}
split authentication to separate modules
2012-08-16 11:30:35 +00:00
}
} else {
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth = $this->pdo->prepare("SELECT id
FROM ttrss_users WHERE
login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth->execute([$login, $pwd_hash1, $pwd_hash2]);
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
if ($row = $sth->fetch()) {
return $row['id'];
}
split authentication to separate modules
2012-08-16 11:30:35 +00:00
}
} else {
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth = $this->pdo->prepare("SELECT id
FROM ttrss_users WHERE
login = ? AND (pwd_hash = ? OR pwd_hash = ?)");
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth->execute([$login, $pwd_hash1, $pwd_hash2]);
split authentication to separate modules
2012-08-16 11:30:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
if ($row = $sth->fetch()) {
return $row['id'];
}
}
split authentication to separate modules
2012-08-16 11:30:35 +00:00
return false;
}
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
require entering password before enabling/disabling otp
2012-09-04 08:39:33 +00:00
function check_password($owner_uid, $password) {
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth = $this->pdo->prepare("SELECT salt,login FROM ttrss_users WHERE
id = ?");
$sth->execute([$owner_uid]);
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
if ($row = $sth->fetch()) {
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$salt = $row['salt'];
$login = $row['login'];
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
if (!$salt) {
$password_hash1 = encrypt_password($password);
$password_hash2 = encrypt_password($password, $login);
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
id = ? AND (pwd_hash = ? OR pwd_hash = ?)");
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$sth->execute([$owner_uid, $password_hash1, $password_hash2]);
return $sth->fetch();
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
} 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();
}
}
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
return false;
require entering password before enabling/disabling otp
2012-09-04 08:39:33 +00:00
}
function change_password($owner_uid, $old_password, $new_password) {
if ($this->check_password($owner_uid, $old_password)) {
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$new_password_hash = encrypt_password($new_password, $new_salt, true);
auth_internal: use PDO + other fixes
2017-12-02 21:18:08 +00:00
$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]);
move changing password code to authentication modules
2012-08-16 14:21:35 +00:00
$_SESSION["pwd_hash"] = $new_password_hash;
return __("Password has been changed.");
} else {
return "ERROR: ".__('Old password is incorrect.');
}
}
plugins: bump API version
2013-04-19 13:31:56 +00:00
function api_version() {
return 2;
}
split authentication to separate modules
2012-08-16 11:30:35 +00:00
}
?>