X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=4c695cc1e3be345320a41debea00297b49cae016;hb=2e8caf7f27197be5f12ea22f4a5e9aae2bb1ee89;hp=382d2c65877da5e1f82710a9e16cf4192217c4d5;hpb=9a3f5eaf7d4cd6b16f21e9a5f11278e55107b62f;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index 382d2c6587..4c695cc1e3 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,14 +1,25 @@
 <?php
 
 
+require_once('include/security.php');
+require_once('include/datetime.php');
+
 function nuke_session() {
+	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']);
 	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']);
 }
 
 
@@ -22,10 +33,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 +55,34 @@ 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 `account_removed` = 0 AND `verified` = 1 LIMIT 1",
 			intval($_SESSION['uid'])
 		);
 
 		if(! count($r)) {
 			nuke_session();
-			goaway($a->get_baseurl());
+			goaway(z_root());
 		}
 
-		// 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'];
+		// 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['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;
-
+			$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
+			$login_refresh = true;
 		}
-		header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
+		authenticate_success($r[0], false, false, $login_refresh);
 	}
 }
 else {
@@ -97,11 +94,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 +110,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 +159,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 `account_removed` = 0 AND `verified` = 1 LIMIT 1",
+				dbesc(trim($_POST['username'])),
+				dbesc(trim($_POST['username'])),
 				dbesc($encrypted)
 			);
 			if(count($r))
@@ -188,83 +171,41 @@ 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'];
+		// 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
 		}
-
-		$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;
+		else {
+			new_cookie(0); // 0 means delete on browser exit
 		}
 
-		$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']);
+		$_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) {
+	$old_sid = session_id();
+	session_set_cookie_params("$time");
+	session_regenerate_id(false);
 
+	q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+}