2012-08-16 11:30:35 +00:00
|
|
|
<?php
|
|
|
|
|
class Auth_Internal extends Auth_Base {
|
|
|
|
|
|
|
|
|
|
function authenticate($login, $password) {
|
|
|
|
|
|
|
|
|
|
$pwd_hash1 = encrypt_password($password);
|
|
|
|
|
$pwd_hash2 = encrypt_password($password, $login);
|
|
|
|
|
$login = db_escape_string($login);
|
2012-09-03 14:33:46 +00:00
|
|
|
$otp = db_escape_string($_REQUEST["otp"]);
|
|
|
|
|
|
|
|
|
|
if (get_schema_version($this->link) > 96) {
|
2012-09-03 18:32:24 +00:00
|
|
|
if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
|
|
|
|
|
$result = db_query($this->link, "SELECT otp_enabled,salt FROM ttrss_users WHERE
|
|
|
|
|
login = '$login'");
|
|
|
|
|
|
|
|
|
|
if (db_num_rows($result) > 0) {
|
|
|
|
|
require_once "lib/otphp/vendor/base32.php";
|
|
|
|
|
require_once "lib/otphp/lib/otp.php";
|
|
|
|
|
require_once "lib/otphp/lib/totp.php";
|
|
|
|
|
|
|
|
|
|
$base32 = new Base32();
|
|
|
|
|
|
|
|
|
|
$otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled"));
|
|
|
|
|
$secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
|
|
|
|
|
|
|
|
|
|
$topt = new \OTPHP\TOTP($secret);
|
|
|
|
|
$otp_check = $topt->now();
|
|
|
|
|
|
|
|
|
|
if ($otp_enabled) {
|
|
|
|
|
if ($otp) {
|
|
|
|
|
if ($otp != $otp_check) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2012-09-10 15:18:44 +00:00
|
|
|
$return = urlencode($_REQUEST["return"]);
|
2012-09-03 18:32:24 +00:00
|
|
|
?><html>
|
|
|
|
|
<head><title>Tiny Tiny RSS</title></head>
|
|
|
|
|
<body>
|
2012-09-10 15:18:44 +00:00
|
|
|
<form action="public.php?return=<?php echo $return ?>"
|
|
|
|
|
method="POST">
|
|
|
|
|
<input type="hidden" name="op" value="login">
|
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) ?>">
|
|
|
|
|
|
|
|
|
|
<label><?php echo __("Please enter your one time password:") ?></label>
|
|
|
|
|
<input type="password" size="6" name="otp"/>
|
|
|
|
|
<input type="submit" value="Continue"/>
|
|
|
|
|
</form>
|
2012-09-04 08:08:50 +00:00
|
|
|
<script type="text/javascript">
|
|
|
|
|
document.forms[0].otp.focus();
|
|
|
|
|
</script>
|
2012-09-03 18:32:24 +00:00
|
|
|
<?php
|
|
|
|
|
exit;
|
2012-09-03 14:53:19 +00:00
|
|
|
}
|
2012-09-03 14:33:46 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-08-16 11:30:35 +00:00
|
|
|
|
|
|
|
|
if (get_schema_version($this->link) > 87) {
|
|
|
|
|
|
|
|
|
|
$result = db_query($this->link, "SELECT salt FROM ttrss_users WHERE
|
|
|
|
|
login = '$login'");
|
|
|
|
|
|
|
|
|
|
if (db_num_rows($result) != 1) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$salt = db_fetch_result($result, 0, "salt");
|
|
|
|
|
|
|
|
|
|
if ($salt == "") {
|
|
|
|
|
|
|
|
|
|
$query = "SELECT id
|
|
|
|
|
FROM ttrss_users WHERE
|
|
|
|
|
login = '$login' AND (pwd_hash = '$pwd_hash1' OR
|
|
|
|
|
pwd_hash = '$pwd_hash2')";
|
|
|
|
|
|
|
|
|
|
// verify and upgrade password to new salt base
|
|
|
|
|
|
|
|
|
|
$result = db_query($this->link, $query);
|
|
|
|
|
|
|
|
|
|
if (db_num_rows($result) == 1) {
|
|
|
|
|
// upgrade password to MODE2
|
|
|
|
|
|
|
|
|
|
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
|
|
|
|
|
$pwd_hash = encrypt_password($password, $salt, true);
|
|
|
|
|
|
|
|
|
|
db_query($this->link, "UPDATE ttrss_users SET
|
|
|
|
|
pwd_hash = '$pwd_hash', salt = '$salt' WHERE login = '$login'");
|
|
|
|
|
|
|
|
|
|
$query = "SELECT id
|
|
|
|
|
FROM ttrss_users WHERE
|
|
|
|
|
login = '$login' AND pwd_hash = '$pwd_hash'";
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
$pwd_hash = encrypt_password($password, $salt, true);
|
|
|
|
|
|
|
|
|
|
$query = "SELECT id
|
|
|
|
|
FROM ttrss_users WHERE
|
|
|
|
|
login = '$login' AND pwd_hash = '$pwd_hash'";
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
$query = "SELECT id
|
|
|
|
|
FROM ttrss_users WHERE
|
|
|
|
|
login = '$login' AND (pwd_hash = '$pwd_hash1' OR
|
|
|
|
|
pwd_hash = '$pwd_hash2')";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$result = db_query($this->link, $query);
|
|
|
|
|
|
|
|
|
|
if (db_num_rows($result) == 1) {
|
|
|
|
|
return db_fetch_result($result, 0, "id");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2012-08-16 14:21:35 +00:00
|
|
|
|
2012-09-04 08:39:33 +00:00
|
|
|
function check_password($owner_uid, $password) {
|
2012-08-16 14:21:35 +00:00
|
|
|
$owner_uid = db_escape_string($owner_uid);
|
|
|
|
|
|
2012-08-16 14:27:26 +00:00
|
|
|
$result = db_query($this->link, "SELECT salt,login FROM ttrss_users WHERE
|
2012-08-16 14:21:35 +00:00
|
|
|
id = '$owner_uid'");
|
|
|
|
|
|
|
|
|
|
$salt = db_fetch_result($result, 0, "salt");
|
2012-08-16 14:27:26 +00:00
|
|
|
$login = db_fetch_result($result, 0, "login");
|
2012-08-16 14:21:35 +00:00
|
|
|
|
|
|
|
|
if (!$salt) {
|
2012-09-04 08:39:33 +00:00
|
|
|
$password_hash1 = encrypt_password($password);
|
|
|
|
|
$password_hash2 = encrypt_password($password, $login);
|
2012-08-16 14:21:35 +00:00
|
|
|
|
|
|
|
|
$query = "SELECT id FROM ttrss_users WHERE
|
2012-09-04 08:39:33 +00:00
|
|
|
id = '$owner_uid' AND (pwd_hash = '$password_hash1' OR
|
|
|
|
|
pwd_hash = '$password_hash2')";
|
2012-08-16 14:21:35 +00:00
|
|
|
|
|
|
|
|
} else {
|
2012-09-04 08:39:33 +00:00
|
|
|
$password_hash = encrypt_password($password, $salt, true);
|
2012-08-16 14:21:35 +00:00
|
|
|
|
|
|
|
|
$query = "SELECT id FROM ttrss_users WHERE
|
2012-09-04 08:39:33 +00:00
|
|
|
id = '$owner_uid' AND pwd_hash = '$password_hash'";
|
2012-08-16 14:21:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$result = db_query($this->link, $query);
|
|
|
|
|
|
2012-09-04 08:39:33 +00:00
|
|
|
return db_num_rows($result) != 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function change_password($owner_uid, $old_password, $new_password) {
|
|
|
|
|
$owner_uid = db_escape_string($owner_uid);
|
|
|
|
|
|
|
|
|
|
if ($this->check_password($owner_uid, $old_password)) {
|
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);
|
|
|
|
|
|
|
|
|
|
db_query($this->link, "UPDATE ttrss_users SET
|
2012-09-03 14:33:46 +00:00
|
|
|
pwd_hash = '$new_password_hash', salt = '$new_salt', otp_enabled = false
|
2012-08-16 14:21:35 +00:00
|
|
|
WHERE id = '$owner_uid'");
|
|
|
|
|
|
|
|
|
|
$_SESSION["pwd_hash"] = $new_password_hash;
|
|
|
|
|
|
|
|
|
|
return __("Password has been changed.");
|
|
|
|
|
} else {
|
|
|
|
|
return "ERROR: ".__('Old password is incorrect.');
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-08-16 11:30:35 +00:00
|
|
|
}
|
|
|
|
|
?>
|
