"Remember Me" should work now but needs more fine tuning

diff --git a/include/auth.php b/include/auth.php
index 2fbc270d7f4bc6a8ab6bd53e3d41c405f0115d05..4f3d0d31bb023562ca076bd5d4e8d0a6883d791c 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,6 +1,4 @@
 <?php
-
-
 require_once('include/security.php');
 require_once('include/datetime.php');
 
@@ -13,7 +11,6 @@ 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 `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
@@ -26,15 +23,16 @@ if(isset($_COOKIE["Friendica"])) {
 
                        // Do the authentification if not done by now
                        if(!isset($_SESSION) OR !isset($_SESSION['authenticated'])) {
-                               authenticate_success($r[0], false, false, false);
+                               authenticate_success($r[0]);
 
-                       if (get_config('system','paranoia'))
-                               $_SESSION['addr'] = $data->ip;
+                               if (get_config('system','paranoia'))
+                                       $_SESSION['addr'] = $data->ip;
                        }
                }
        }
 }
 
+
 // login/logout
 
 if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) {
@@ -44,8 +42,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                // process logout request
                call_hooks("logging_out");
                nuke_session();
-               new_cookie(-1);
-               info( t('Logged out.') . EOL);
+               info(t('Logged out.').EOL);
                goaway(z_root());
        }
 
@@ -66,7 +63,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                // 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. '
-                               . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
+                               . $_SESSION['addr'].' != '.$_SERVER['REMOTE_ADDR']);
                        nuke_session();
                        goaway(z_root());
                }
@@ -87,7 +84,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                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 ) {
+               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;
@@ -96,9 +93,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
        }
 } else {
 
-       if(isset($_SESSION)) {
-               nuke_session();
-       }
+       session_unset();
 
        if((x($_POST,'password')) && strlen($_POST['password']))
                $encrypted = hash('whirlpool',trim($_POST['password']));
@@ -108,7 +103,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 
                        $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
 
@@ -118,24 +113,24 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 
                        if(($noid) || (strpos($temp_string,'@')) || (! validate_url($temp_string))) {
                                $a = get_app();
-                               notice( t('Login failed.') . EOL);
+                               notice(t('Login failed.').EOL);
                                goaway(z_root());
                                // NOTREACHED
                        }
 
                        // Otherwise it's probably an openid.
 
-                        try {
-                       require_once('library/openid.php');
-                       $openid = new LightOpenID;
-                       $openid->identity = $openid_url;
-                       $_SESSION['openid'] = $openid_url;
-                       $a = get_app();
-                       $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());
-                        }
+                       try {
+                               require_once('library/openid.php');
+                               $openid = new LightOpenID;
+                               $openid->identity = $openid_url;
+                               $_SESSION['openid'] = $openid_url;
+                               $a = get_app();
+                               $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());
+                       }
                        // NOTREACHED
                }
        }
@@ -163,13 +158,12 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 
                if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) {
                        $record = $addon_auth['user_record'];
-               }
-               else {
+               } 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' )
+                               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'])),
@@ -180,10 +174,10 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                }
 
                if (!$record || !count($record)) {
-                       logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
-                       notice( t('Login failed.') . EOL );
+                       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 set a cookie
                // that expires after one week (the default is when the browser is closed).
@@ -206,7 +200,8 @@ function new_cookie($time, $value = "") {
        if ($time != 0)
                $time = $time + time();
 
-       setcookie("Friendica", $value, $time);
+       setcookie("Friendica", $value, $time, "/", "",
+               (get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);
 
        return;
 }

diff --git a/index.php b/index.php
index 9301227ea81e9b43ceedf5c4b0c644bd0f30372b..c6a9a88fe1013d299d6586758f27b4bfebf421f6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -147,7 +147,7 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
 
 // 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");
 
 if(! x($_SESSION,'authenticated'))