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

fix various password-change related functions

This commit is contained in:
Andrew Dolgov 2012-01-23 12:20:09 +04:00
parent 8b4fb0d0d6
commit 098df83ba6
3 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
classes/pref_prefs.php
View File

@ -28,34 +28,43 @@ class Pref_Prefs extends Protected_Handler {
return; return;
} }
$old_pw_hash1 = encrypt_password($old_pw); $result = db_query($this->link, "SELECT salt FROM ttrss_users WHERE
$old_pw_hash2 = encrypt_password($old_pw, $_SESSION["name"]); id = " . $_SESSION['uid']);
$new_pw_hash = encrypt_password($new_pw, $_SESSION["name"]);
$active_uid = $_SESSION["uid"]; $salt = db_fetch_result($result, 0, "salt");
if ($old_pw && $new_pw) { if (!$salt) {
$old_pw_hash1 = encrypt_password($old_pw);
$old_pw_hash2 = encrypt_password($old_pw, $_SESSION["name"]);
$login = db_escape_string($_SERVER['PHP_AUTH_USER']); $query = "SELECT id FROM ttrss_users WHERE
id = ".$_SESSION['uid']." AND (pwd_hash = '$old_pw_hash1' OR
pwd_hash = '$old_pw_hash2')";
$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE } else {
id = '$active_uid' AND (pwd_hash = '$old_pw_hash1' OR $old_pw_hash = encrypt_password($old_pw, $salt, true);
pwd_hash = '$old_pw_hash2')");
if (db_num_rows($result) == 1) { $query = "SELECT id FROM ttrss_users WHERE
db_query($this->link, "UPDATE ttrss_users SET pwd_hash = '$new_pw_hash' id = ".$_SESSION['uid']." AND pwd_hash = '$old_pw_hash'";
WHERE id = '$active_uid'");
$_SESSION["pwd_hash"] = $new_pw_hash;
print __("Password has been changed.");
} else {
print "ERROR: ".__('Old password is incorrect.');
}
} }
return; $result = db_query($this->link, $query);
if (db_num_rows($result) == 1) {
$new_salt = substr(bin2hex(openssl_random_pseudo_bytes(125)), 0, 250);
$new_pw_hash = encrypt_password($new_pw, $new_salt, true);
db_query($this->link, "UPDATE ttrss_users SET
pwd_hash = '$new_pw_hash', salt = '$new_salt'
WHERE id = ".$_SESSION['uid']);
$_SESSION["pwd_hash"] = $new_pw_hash;
print __("Password has been changed.");
} else {
print "ERROR: ".__('Old password is incorrect.');
}
} }
function saveconfig() { function saveconfig() {

22
classes/pref_users.php
View File

@ -206,8 +206,9 @@ class Pref_Users extends Protected_Handler {
$password = db_escape_string(trim($_REQUEST["password"])); $password = db_escape_string(trim($_REQUEST["password"]));
if ($password) { if ($password) {
$pwd_hash = encrypt_password($password, $login); $salt = substr(bin2hex(openssl_random_pseudo_bytes(125)), 0, 250);
$pass_query_part = "pwd_hash = '$pwd_hash', "; $pwd_hash = encrypt_password($password, $salt, true);
$pass_query_part = "pwd_hash = '$pwd_hash', salt = '$salt',";
} else { } else {
$pass_query_part = ""; $pass_query_part = "";
} }
@ -233,7 +234,8 @@ class Pref_Users extends Protected_Handler {
$login = db_escape_string(trim($_REQUEST["login"])); $login = db_escape_string(trim($_REQUEST["login"]));
$tmp_user_pwd = make_password(8); $tmp_user_pwd = make_password(8);
$pwd_hash = encrypt_password($tmp_user_pwd, $login); $salt = substr(bin2hex(openssl_random_pseudo_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
login = '$login'"); login = '$login'");
@ -241,8 +243,8 @@ class Pref_Users extends Protected_Handler {
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
db_query($this->link, "INSERT INTO ttrss_users db_query($this->link, "INSERT INTO ttrss_users
(login,pwd_hash,access_level,last_login,created) (login,pwd_hash,access_level,last_login,created, salt)
VALUES ('$login', '$pwd_hash', 0, null, NOW())"); VALUES ('$login', '$pwd_hash', 0, null, NOW(), '$salt')");
$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
@ -276,10 +278,14 @@ class Pref_Users extends Protected_Handler {
$login = db_fetch_result($result, 0, "login"); $login = db_fetch_result($result, 0, "login");
$email = db_fetch_result($result, 0, "email"); $email = db_fetch_result($result, 0, "email");
$tmp_user_pwd = make_password(8); $salt = db_fetch_result($result, 0, "salt");
$pwd_hash = encrypt_password($tmp_user_pwd, $login);
db_query($this->link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash' $new_salt = substr(bin2hex(openssl_random_pseudo_bytes(125)), 0, 250);
$tmp_user_pwd = make_password(8);
$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
db_query($this->link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt'
WHERE id = '$uid'"); WHERE id = '$uid'");
print T_sprintf("Changed password of user <b>%s</b> print T_sprintf("Changed password of user <b>%s</b>

7
register.php
View File

@ -270,11 +270,12 @@
$password = make_password(); $password = make_password();
$pwd_hash = encrypt_password($password, $login); $salt = substr(bin2hex(openssl_random_pseudo_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($password, $salt, true);
db_query($link, "INSERT INTO ttrss_users db_query($link, "INSERT INTO ttrss_users
(login,pwd_hash,access_level,last_login, email, created) (login,pwd_hash,access_level,last_login, email, created, salt)
VALUES ('$login', '$pwd_hash', 0, null, '$email', NOW())"); VALUES ('$login', '$pwd_hash', 0, null, '$email', NOW(), '$salt')");
$result = db_query($link, "SELECT id FROM ttrss_users WHERE $result = db_query($link, "SELECT id FROM ttrss_users WHERE
login = '$login' AND pwd_hash = '$pwd_hash'"); login = '$login' AND pwd_hash = '$pwd_hash'");