friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2483 from annando/1604-cookie 

"remember me" should work now reliable
This commit is contained in:
Tobias Diekershoff 2016-04-26 06:45:20 +02:00
parent 9ec9ea3844 ca72c5f256
commit d049ffa96c
2 changed files with 115 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
include/auth.php
View File

@ -1,58 +1,79 @@
<?php <?php
require_once('include/security.php'); require_once('include/security.php');
require_once('include/datetime.php'); require_once('include/datetime.php');
function nuke_session() { // When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
if (isset($_COOKIE["Friendica"])) {
$data = json_decode($_COOKIE["Friendica"]);
if (isset($data->uid)) {
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE `uid` = %d AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1",
intval($data->uid)
);
new_cookie(0); // make sure cookie is deleted on browser close, as a security measure if ($r) {
session_unset(); if ($data->hash != cookie_hash($r[0])) {
logger("Hash for user ".$data->uid." doesn't fit.");
nuke_session();
goaway(z_root());
}
// Renew the cookie
new_cookie(604800, $r[0]);
// Do the authentification if not done by now
if (!isset($_SESSION) OR !isset($_SESSION['authenticated'])) {
authenticate_success($r[0]);
if (get_config('system','paranoia'))
$_SESSION['addr'] = $data->ip;
}
}
}
} }
// login/logout // login/logout
if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) { if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params') || ($_POST['auth-params'] !== 'login'))) {
if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) { if ((x($_POST,'auth-params') && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
// process logout request // process logout request
call_hooks("logging_out"); call_hooks("logging_out");
nuke_session(); nuke_session();
new_cookie(-1); info(t('Logged out.').EOL);
info( t('Logged out.') . EOL);
goaway(z_root()); goaway(z_root());
} }
if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) { if (x($_SESSION,'visitor_id') && !x($_SESSION,'uid')) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($_SESSION['visitor_id']) intval($_SESSION['visitor_id'])
); );
if(count($r)) { if (count($r)) {
$a->contact = $r[0]; $a->contact = $r[0];
} }
} }
if(x($_SESSION,'uid')) { if (x($_SESSION,'uid')) {
// already logged in user returning // already logged in user returning
$check = get_config('system','paranoia'); $check = get_config('system','paranoia');
// extra paranoia - if the IP changed, log them out // extra paranoia - if the IP changed, log them out
if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) { if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
logger('Session address changed. Paranoid setting in effect, blocking session. ' logger('Session address changed. Paranoid setting in effect, blocking session. '.
. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); $_SESSION['addr'].' != '.$_SERVER['REMOTE_ADDR']);
nuke_session(); nuke_session();
goaway(z_root()); goaway(z_root());
} }
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", FROM `user` WHERE `uid` = %d AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1",
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
if(! count($r)) { if (!count($r)) {
nuke_session(); nuke_session();
goaway(z_root()); goaway(z_root());
} }
@ -60,10 +81,10 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
// Make sure to refresh the last login time for the user if the user // Make sure to refresh the last login time for the user if the user
// stays logged in for a long time, e.g. with "Remember Me" // stays logged in for a long time, e.g. with "Remember Me"
$login_refresh = false; $login_refresh = false;
if(! x($_SESSION['last_login_date'])) { if (!x($_SESSION['last_login_date'])) {
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); $_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
} }
if( strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0 ) { if (strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0) {
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); $_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
$login_refresh = true; $login_refresh = true;
@ -72,19 +93,17 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
} }
} else { } else {
if(isset($_SESSION)) { session_unset();
nuke_session();
}
if((x($_POST,'password')) && strlen($_POST['password'])) if (x($_POST,'password') && strlen($_POST['password']))
$encrypted = hash('whirlpool',trim($_POST['password'])); $encrypted = hash('whirlpool',trim($_POST['password']));
else { else {
if((x($_POST,'openid_url')) && strlen($_POST['openid_url']) || if ((x($_POST,'openid_url')) && strlen($_POST['openid_url']) ||
(x($_POST,'username')) && strlen($_POST['username'])) { (x($_POST,'username')) && strlen($_POST['username'])) {
$noid = get_config('system','no_openid'); $noid = get_config('system','no_openid');
$openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) ); $openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']));
// validate_url alters the calling parameter // validate_url alters the calling parameter
@ -92,36 +111,36 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
// if it's an email address or doesn't resolve to a URL, fail. // if it's an email address or doesn't resolve to a URL, fail.
if(($noid) || (strpos($temp_string,'@')) || (! validate_url($temp_string))) { if ($noid || strpos($temp_string,'@') || !validate_url($temp_string)) {
$a = get_app(); $a = get_app();
notice( t('Login failed.') . EOL); notice(t('Login failed.').EOL);
goaway(z_root()); goaway(z_root());
// NOTREACHED // NOTREACHED
} }
// Otherwise it's probably an openid. // Otherwise it's probably an openid.
try { try {
require_once('library/openid.php'); require_once('library/openid.php');
$openid = new LightOpenID; $openid = new LightOpenID;
$openid->identity = $openid_url; $openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url; $_SESSION['openid'] = $openid_url;
$a = get_app(); $a = get_app();
$openid->returnUrl = $a->get_baseurl(true) . '/openid'; $openid->returnUrl = $a->get_baseurl(true).'/openid';
goaway($openid->authUrl()); goaway($openid->authUrl());
} catch (Exception $e) { } catch (Exception $e) {
notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage()); notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'.t('The error message was:').' '.$e->getMessage());
} }
// NOTREACHED // NOTREACHED
} }
} }
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') { if (x($_POST,'auth-params') && $_POST['auth-params'] === 'login') {
$record = null; $record = null;
$addon_auth = array( $addon_auth = array(
'username' => trim($_POST['username']), 'username' => trim($_POST['username']),
'password' => trim($_POST['password']), 'password' => trim($_POST['password']),
'authenticated' => 0, 'authenticated' => 0,
'user_record' => null 'user_record' => null
@ -137,48 +156,37 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
call_hooks('authenticate', $addon_auth); call_hooks('authenticate', $addon_auth);
if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) { if ($addon_auth['authenticated'] && count($addon_auth['user_record']))
$record = $addon_auth['user_record']; $record = $addon_auth['user_record'];
}
else { else {
// process normal login request // process normal login request
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) FROM `user` WHERE (`email` = '%s' OR `nickname` = '%s')
AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", AND `password` = '%s' AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1",
dbesc(trim($_POST['username'])), dbesc(trim($_POST['username'])),
dbesc(trim($_POST['username'])), dbesc(trim($_POST['username'])),
dbesc($encrypted) dbesc($encrypted)
); );
if(count($r)) if (count($r))
$record = $r[0]; $record = $r[0];
} }
if((! $record) || (! count($record))) { if (!$record || !count($record)) {
logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); logger('authenticate: failed login attempt: '.notags(trim($_POST['username'])).' from IP '.$_SERVER['REMOTE_ADDR']);
notice( t('Login failed.') . EOL ); notice(t('Login failed.').EOL);
goaway(z_root()); goaway(z_root());
} }
// If the user specified to remember the authentication, then change the cookie // If the user specified to remember the authentication, then set a cookie
// to expire after one year (the default is when the browser is closed). // that expires after one week (the default is when the browser is closed).
// If the user did not specify to remember, change the cookie to expire when the // The cookie will be renewed automatically.
// browser is closed. The reason this is necessary is because if the user // The week ensures that sessions will expire after some inactivity.
// specifies to remember, then logs out and logs back in without specifying to if ($_POST['remember'])
// remember, the old "remember" cookie may remain and prevent the session from new_cookie(604800, $r[0]);
// expiring when the browser is closed. else
//
// It seems like I should be able to test for the old cookie, but for some reason when
// I read the lifetime value from session_get_cookie_params(), I always get '0'
// (i.e. expire when the browser is closed), even when there's a time expiration
// on the cookie
if($_POST['remember']) {
new_cookie(31449600); // one year
}
else {
new_cookie(0); // 0 means delete on browser exit new_cookie(0); // 0 means delete on browser exit
}
// if we haven't failed up this point, log them in. // if we haven't failed up this point, log them in.
@ -187,12 +195,48 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
} }
} }
function new_cookie($time) { /**
* @brief Kills the "Friendica" cookie and all session data
*/
function nuke_session() {
new_cookie(-3600); // make sure cookie is deleted on browser close, as a security measure
session_unset();
session_destroy();
}
/**
* @brief Calculate the hash that is needed for the "Friendica" cookie
*
* @param array $user Record from "user" table
*
* @return string Hashed data
*/
function cookie_hash($user) {
return(hash("sha256", get_config("system", "site_prvkey").
$user["uprvkey"].
$user["password"]));
}
/**
* @brief Set the "Friendica" cookie
*
* @param int $time
* @param array $user Record from "user" table
*/
function new_cookie($time, $user = array()) {
if ($time != 0) if ($time != 0)
$time = $time + time(); $time = $time + time();
$params = session_get_cookie_params(); if ($user)
setcookie(session_name(), session_id(), $time, $params['path'], $params['domain'], $params['secure'], isset($params['httponly'])); $value = json_encode(array("uid" => $user["uid"],
return; "hash" => cookie_hash($user),
"ip" => $_SERVER['REMOTE_ADDR']));
else
$value = "";
setcookie("Friendica", $value, $time, "/", "",
(get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);
} }

2
index.php
View File

@ -147,7 +147,7 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
// header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";'); // header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');
if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login')) if(x($_COOKIE["Friendica"]) || (x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
require("include/auth.php"); require("include/auth.php");
if(! x($_SESSION,'authenticated')) if(! x($_SESSION,'authenticated'))