X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=a5b6432fff37c35cc31070eb7ae585129accfae1;hb=ec57b61f012562e3a2464869d62ade97fdc2e8d9;hp=f10704eda5a5df8c868de11115ac9e54ab85851c;hpb=01daaafc92d09f042ae3f881bf97606c449f6d3e;p=friendica.git
diff --git a/include/auth.php b/include/auth.php
index f10704eda5..a5b6432fff 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -2,8 +2,16 @@
require_once('include/security.php');
+require_once('include/datetime.php');
function nuke_session() {
+ if (get_config('system', 'disable_database_session')) {
+ session_unset();
+ return;
+ }
+
+ new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
+
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
unset($_SESSION['visitor_id']);
@@ -17,10 +25,11 @@ function nuke_session() {
unset($_SESSION['my_address']);
unset($_SESSION['addr']);
unset($_SESSION['return_url']);
+
}
-// login/logout
+// login/logout
@@ -28,7 +37,7 @@ function nuke_session() {
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')) {
-
+
// process logout request
call_hooks("logging_out");
nuke_session();
@@ -52,14 +61,14 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
$check = get_config('system','paranoia');
// extra paranoia - if the IP changed, log them out
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']);
nuke_session();
goaway(z_root());
}
- $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 `verified` = 1 LIMIT 1",
+ $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",
intval($_SESSION['uid'])
);
@@ -68,7 +77,18 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
goaway(z_root());
}
- authenticate_success($r[0]);
+ // 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"
+ $login_refresh = false;
+ if(! x($_SESSION['last_login_date'])) {
+ $_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
+ }
+ if( strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0 ) {
+
+ $_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
+ $login_refresh = true;
+ }
+ authenticate_success($r[0], false, false, $login_refresh);
}
}
else {
@@ -108,7 +128,7 @@ else {
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$a = get_app();
- $openid->returnUrl = $a->get_baseurl(true) . '/openid';
+ $openid->returnUrl = $a->get_baseurl(true) . '/openid';
goaway($openid->authUrl());
} 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.').'
'. t('The error message was:').' '.$e->getMessage());
@@ -145,9 +165,9 @@ else {
// process normal login request
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
- FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
- AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+ $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+ 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",
dbesc(trim($_POST['username'])),
dbesc(trim($_POST['username'])),
dbesc($encrypted)
@@ -157,34 +177,45 @@ else {
}
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 );
goaway(z_root());
}
+ // If the user specified to remember the authentication, then change the cookie
+ // to expire after one year (the default is when the browser is closed).
+ // If the user did not specify to remember, change the cookie to expire when the
+ // browser is closed. The reason this is necessary is because if the user
+ // specifies to remember, then logs out and logs back in without specifying to
+ // remember, the old "remember" cookie may remain and prevent the session from
+ // expiring when the browser is closed.
+ //
+ // 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
+ }
+
// if we haven't failed up this point, log them in.
+ $_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
authenticate_success($record, true, true);
}
}
-// Returns an array of group id's this contact is a member of.
-// This array will only contain group id's related to the uid of this
-// DFRN contact. They are *not* neccessarily unique across the entire site.
-
-
-if(! function_exists('init_groups_visitor')) {
-function init_groups_visitor($contact_id) {
- $groups = array();
- $r = q("SELECT `gid` FROM `group_member`
- WHERE `contact-id` = %d ",
- intval($contact_id)
- );
- if(count($r)) {
- foreach($r as $rr)
- $groups[] = $rr['gid'];
- }
- return $groups;
-}}
+function new_cookie($time) {
+ if (!get_config('system', 'disable_database_session'))
+ $old_sid = session_id();
+ session_set_cookie_params($time);
+ if (!get_config('system', 'disable_database_session')) {
+ session_regenerate_id(false);
+ q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+ }
+}