]> git.mxchange.org Git - friendica.git/blobdiff - include/auth.php
Merge pull request #317 from CatoTH/master
[friendica.git] / include / auth.php
index 382d2c65877da5e1f82710a9e16cf4192217c4d5..cba6a67a7fd7ec5124b919540bc3b6bf118013cc 100644 (file)
@@ -1,6 +1,8 @@
 <?php
 
 
+require_once('include/security.php');
+
 function nuke_session() {
        unset($_SESSION['authenticated']);
        unset($_SESSION['uid']);
@@ -9,6 +11,13 @@ function nuke_session() {
        unset($_SESSION['cid']);
        unset($_SESSION['theme']);
        unset($_SESSION['page_flags']);
+       unset($_SESSION['submanage']);
+       unset($_SESSION['my_url']);
+       unset($_SESSION['my_address']);
+       unset($_SESSION['addr']);
+       unset($_SESSION['return_url']);
+       unset($_SESSION['theme']);
+       unset($_SESSION['page_flags']);
 }
 
 
@@ -22,10 +31,10 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
        if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
        
                // process logout request
-
+               call_hooks("logging_out");
                nuke_session();
-               notice( t('Logged out.') . EOL);
-               goaway($a->get_baseurl());
+               info( t('Logged out.') . EOL);
+               goaway(z_root());
        }
 
        if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
@@ -44,48 +53,23 @@ 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. ' 
+                               . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
                        nuke_session();
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                }
 
-               $r = q("SELECT * FROM `user` WHERE `uid` = %d 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 `verified` = 1 LIMIT 1",
                        intval($_SESSION['uid'])
                );
 
                if(! count($r)) {
                        nuke_session();
-                       goaway($a->get_baseurl());
-               }
-
-               // initialise user environment
-
-               $a->user = $r[0];
-               $_SESSION['theme'] = $a->user['theme'];
-               $_SESSION['page_flags'] = $a->user['page-flags'];
-
-               if(strlen($a->user['timezone'])) {
-                       date_default_timezone_set($a->user['timezone']);
-                       $a->timezone = $a->user['timezone'];
+                       goaway(z_root());
                }
 
-               $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-
-               $r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
-                       dbesc($a->user['password']),
-                       dbesc($a->user['email'])
-               );
-               if(count($r))
-                       $a->identities = $r;
-
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-                       intval($_SESSION['uid']));
-               if(count($r)) {
-                       $a->contact = $r[0];
-                       $a->cid = $r[0]['id'];
-                       $_SESSION['cid'] = $a->cid;
-
-               }
-               header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
+               authenticate_success($r[0]);
        }
 }
 else {
@@ -97,11 +81,12 @@ else {
        if((x($_POST,'password')) && strlen($_POST['password']))
                $encrypted = hash('whirlpool',trim($_POST['password']));
        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'])) {
 
                        $noid = get_config('system','no_openid');
 
-                       $openid_url = trim($_POST['openid_url']);
+                       $openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
 
                        // validate_url alters the calling parameter
 
@@ -112,49 +97,33 @@ else {
                        if(($noid) || (strpos($temp_string,'@')) || (! validate_url($temp_string))) {
                                $a = get_app();
                                notice( t('Login failed.') . EOL);
-                               goaway($a->get_baseurl());
+                               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() . '/openid'; 
-
-                       $r = q("SELECT `uid` FROM `user` WHERE `openid` = '%s' LIMIT 1",
-                               dbesc($openid_url)
-                       );
-                       if(count($r)) { 
-                               // existing account
-                               goaway($openid->authUrl());
-                               // NOTREACHED   
-                       }
-                       else {
-                               if($a->config['register_policy'] == REGISTER_CLOSED) {
-                                       $a = get_app();
-                                       notice( t('Login failed.') . EOL);
-                                       goaway($a->get_baseurl());
-                                       // NOTREACHED
-                               }
-                               // new account
-                               $_SESSION['register'] = 1;
-                               $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
-                               $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
-                               goaway($openid->authUrl());
-                               // NOTREACHED   
-                       }
+                       $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
                }
        }
+
        if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
 
                $record = null;
 
                $addon_auth = array(
-                       'username' => trim($_POST['openid_url']), 
+                       'username' => trim($_POST['username']), 
                        'password' => trim($_POST['password']),
                        'authenticated' => 0,
                        'user_record' => null
@@ -177,10 +146,11 @@ else {
 
                        // process normal login request
 
-                       $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
-                               AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
-                               dbesc(trim($_POST['openid_url'])),
-                               dbesc(trim($_POST['openid_url'])),
+                       $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",
+                               dbesc(trim($_POST['username'])),
+                               dbesc(trim($_POST['username'])),
                                dbesc($encrypted)
                        );
                        if(count($r))
@@ -188,63 +158,14 @@ else {
                }
 
                if((! $record) || (! count($record))) {
-                       logger('authenticate: failed login attempt: ' . trim($_POST['openid_url'])); 
+                       logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); 
                        notice( t('Login failed.') . EOL );
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                }
 
-               $_SESSION['uid'] = $record['uid'];
-               $_SESSION['theme'] = $record['theme'];
-               $_SESSION['authenticated'] = 1;
-               $_SESSION['page_flags'] = $record['page-flags'];
-               $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
-               $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
-
-               $a->user = $record;
-
-               if($a->user['login_date'] === '0000-00-00 00:00:00') {
-                       $_SESSION['return_url'] = 'profile_photo/new';
-                       $a->module = 'profile_photo';
-                       notice( t("Welcome ") . $a->user['username'] . EOL);
-                       notice( t('Please upload a profile photo.') . EOL);
-               }
-               else
-                       notice( t("Welcome back ") . $a->user['username'] . EOL);
-
-               if(strlen($a->user['timezone'])) {
-                       date_default_timezone_set($a->user['timezone']);
-                       $a->timezone = $a->user['timezone'];
-               }
-
-               $r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
-                       dbesc($a->user['password']),
-                       dbesc($a->user['email'])
-               );
-               if(count($r))
-                       $a->identities = $r;
-
-
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-                       intval($_SESSION['uid']));
-               if(count($r)) {
-                       $a->contact = $r[0];
-                       $a->cid = $r[0]['id'];
-                       $_SESSION['cid'] = $a->cid;
-               }
-
-               $l = get_language();
-
-               q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
-                       dbesc(datetime_convert()),
-                       dbesc($l),
-                       intval($_SESSION['uid'])
-               );
-
-               call_hooks('logged_in', $a->user);
+               // if we haven't failed up this point, log them in.
 
-               header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
-               if(($a->module !== 'home') && isset($_SESSION['return_url']))
-                       goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+               authenticate_success($record, true, true);
        }
 }