nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

We now work with a hash to avoid cookie manipulation

Browse source
This commit is contained in:
Michael Vogel 2016-04-25 11:19:42 +02:00 committed by Roland Haeder
parent af8b3b1fb7
commit 38ae4f0326
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/auth.php
View file

@ -18,8 +18,14 @@ if(isset($_COOKIE["Friendica"])) {
); );
if ($r) { if ($r) {
if ($data->hash != cookie_hash($r[0])) {
logger("Hash for user ".$data->uid." doesn't fit.");
nuke_session();
goaway(z_root());
}
// Renew the cookie // Renew the cookie
new_cookie(604800, json_encode(array("uid" => $r[0]["uid"], "ip" => $_SERVER['REMOTE_ADDR']))); new_cookie(604800, $r[0]);
// Do the authentification if not done by now // Do the authentification if not done by now
if(!isset($_SESSION) OR !isset($_SESSION['authenticated'])) { if(!isset($_SESSION) OR !isset($_SESSION['authenticated'])) {
@ -184,7 +190,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
// The cookie will be renewed automatically. // The cookie will be renewed automatically.
// The week ensures that sessions will expire after some inactivity. // The week ensures that sessions will expire after some inactivity.
if($_POST['remember']) if($_POST['remember'])
new_cookie(604800, json_encode(array("uid" => $r[0]["uid"], "ip" => $_SERVER['REMOTE_ADDR']))); new_cookie(604800, $r[0]);
else else
new_cookie(0); // 0 means delete on browser exit new_cookie(0); // 0 means delete on browser exit
@ -195,11 +201,24 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
} }
} }
function new_cookie($time, $value = "") { function cookie_hash($user) {
return(hash("sha256", get_config("system", "site_prvkey").
$user["uprvkey"].
$user["password"]));
}
function new_cookie($time, $user = array()) {
if ($time != 0) if ($time != 0)
$time = $time + time(); $time = $time + time();
if ($user)
$value = json_encode(array("uid" => $user["uid"],
"hash" => cookie_hash($user),
"ip" => $_SERVER['REMOTE_ADDR']));
else
$value = "";
setcookie("Friendica", $value, $time, "/", "", setcookie("Friendica", $value, $time, "/", "",
(get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true); (get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);