]> git.mxchange.org Git - friendica.git/blobdiff - include/auth.php
Use the "attachment" element instead of a mixture of several elements
[friendica.git] / include / auth.php
index c4f1f08651a286d029ea7c3411b1d2dce9607aac..4abff1971008ec77f20d83f80cd59e6cc4442f45 100644 (file)
@@ -2,36 +2,25 @@
 
 
 require_once('include/security.php');
+require_once('include/datetime.php');
 
 function nuke_session() {
-       unset($_SESSION['authenticated']);
-       unset($_SESSION['uid']);
-       unset($_SESSION['visitor_id']);
-       unset($_SESSION['administrator']);
-       unset($_SESSION['cid']);
-       unset($_SESSION['theme']);
-       unset($_SESSION['mobile-theme']);
-       unset($_SESSION['page_flags']);
-       unset($_SESSION['submanage']);
-       unset($_SESSION['my_url']);
-       unset($_SESSION['my_address']);
-       unset($_SESSION['addr']);
-       unset($_SESSION['return_url']);
-}
-
-
-// login/logout 
 
+       new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
+       session_unset();
+}
 
 
+// login/logout
 
 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();
+               new_cookie(-1);
                info( t('Logged out.') . EOL);
                goaway(z_root());
        }
@@ -52,14 +41,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,10 +57,20 @@ 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 {
+} else {
 
        if(isset($_SESSION)) {
                nuke_session();
@@ -108,7 +107,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.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());
@@ -145,9 +144,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,15 +156,43 @@ 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);
        }
 }
 
+function new_cookie($time) {
+
+       if ($time != 0)
+               $time = $time + time();
 
+       $params = session_get_cookie_params();
+       setcookie(session_name(), session_id(), $time, $params['path'], $params['domain'], $params['secure'], isset($params['httponly']));
+       return;
+}