X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=a0244571b3fec5703c99a7d5832cc2c51f1f374e;hb=39dd36176bb3c72702d6964394d9409be4d6cdcd;hp=c09a89ffb3ff96746bcf807312bf6e24f5d07672;hpb=875b31fb8efb5fbd5e6682321ac6a6a055cd8e4d;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index c09a89ffb3..a0244571b3 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,20 +1,29 @@
 <?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['page_flags']);
+}
+
+
 // 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
 
-		unset($_SESSION['authenticated']);
-		unset($_SESSION['uid']);
-		unset($_SESSION['visitor_id']);
-		unset($_SESSION['administrator']);
-		unset($_SESSION['cid']);
-		unset($_SESSION['theme']);
-		unset($_SESSION['page_flags']);
+		nuke_session();
 		notice( t('Logged out.') . EOL);
 		goaway($a->get_baseurl());
 	}
@@ -23,13 +32,19 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 
 		// already logged in user returning
 
+		$check = get_config('system','paranoia');
+		// extra paranoia - if the IP changed, log them out
+		if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
+			nuke_session();
+			goaway($a->get_baseurl());
+		}
+
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($_SESSION['uid'])
 		);
 
 		if(! count($r)) {
-			unset($_SESSION['authenticated']);
-			unset($_SESSION['uid']);
+			nuke_session();
 			goaway($a->get_baseurl());
 		}
 
@@ -38,8 +53,11 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		$a->user = $r[0];
 		$_SESSION['theme'] = $a->user['theme'];
 		$_SESSION['page_flags'] = $a->user['page-flags'];
-		if(strlen($a->user['timezone']))
+
+		if(strlen($a->user['timezone'])) {
 			date_default_timezone_set($a->user['timezone']);
+			$a->timezone = $a->user['timezone'];
+		}
 
 		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
@@ -57,65 +75,122 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 else {
 
 	if(isset($_SESSION)) {
-		unset($_SESSION['authenticated']);
-		unset($_SESSION['uid']);
-		unset($_SESSION['visitor_id']);
-		unset($_SESSION['administrator']);
-		unset($_SESSION['cid']);
-		unset($_SESSION['theme']);
-		unset($_SESSION['my_url']);
-		unset($_SESSION['page_flags']);
+		nuke_session();
 	}
 
 	if((x($_POST,'password')) && strlen($_POST['password']))
 		$encrypted = hash('whirlpool',trim($_POST['password']));
 	else {
-		if((x($_POST,'login-name')) && strlen($_POST['login-name'])) {
-			$openid_url = trim($_POST['login-name']);
+		if((x($_POST,'openid_url')) && strlen($_POST['openid_url'])) {
+
+			$noid = get_config('system','no_openid');
+
+			$openid_url = trim($_POST['openid_url']);
+
+			// validate_url alters the calling parameter
+
+			$temp_string = $openid_url;
+
+			// if it's an email address or doesn't resolve to a URL, fail.
+
+			if(($noid) || (strpos($temp_string,'@')) || (! validate_url($temp_string))) {
+				$a = get_app();
+				notice( t('Login failed.') . EOL);
+				goaway($a->get_baseurl());
+				// NOTREACHED
+			}
+
+			// Otherwise it's probably an openid.
+
+			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)) {
-				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'; 
+			if(count($r)) { 
+				// existing account
 				goaway($openid->authUrl());
 				// NOTREACHED	
 			}
 			else {
-				$a = get_app();
-				notice( t('Login failed.') . EOL);
-				goaway($a->get_baseurl());
-				// NOTREACHED
+				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	
 			}
 		}
 	}
 	if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
 
-		// process login request
+		$record = null;
+
+		$addon_auth = array(
+			'username' => trim($_POST['openid_url']), 
+			'password' => trim($_POST['password']),
+			'authenticated' => 0,
+			'user_record' => null
+		);
+
+		/**
+		 *
+		 * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record
+		 * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
+		 * and later plugins should not interfere with an earlier one that succeeded.
+		 *
+		 */
+
+		call_hooks('authenticate', $addon_auth);
 
-		$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['login-name'])),
-			dbesc(trim($_POST['login-name'])),
-			dbesc($encrypted));
-		if(($r === false) || (! count($r))) {
+		if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) {
+			$record = $addon_auth['user_record'];
+		}
+		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'])),
+				dbesc($encrypted)
+			);
+			if(count($r))
+				$record = $r[0];
+		}
+
+		if((! $record) || (! count($record))) {
+			logger('authenticate: failed login attempt: ' . trim($_POST['openid_url'])); 
 			notice( t('Login failed.') . EOL );
 			goaway($a->get_baseurl());
   		}
-		$_SESSION['uid'] = $r[0]['uid'];
-		$_SESSION['theme'] = $r[0]['theme'];
+
+		$_SESSION['uid'] = $record['uid'];
+		$_SESSION['theme'] = $record['theme'];
 		$_SESSION['authenticated'] = 1;
-		$_SESSION['page_flags'] = $r[0]['page-flags'];
-		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
+		$_SESSION['page_flags'] = $record['page-flags'];
+		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
+		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-		notice( t("Welcome back ") . $r[0]['username'] . EOL);
-		$a->user = $r[0];
-		if(strlen($a->user['timezone']))
+		notice( t("Welcome back ") . $record['username'] . EOL);
+		$a->user = $record;
+
+		if(strlen($a->user['timezone'])) {
 			date_default_timezone_set($a->user['timezone']);
+			$a->timezone = $a->user['timezone'];
+		}
 
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
 			intval($_SESSION['uid']));
@@ -124,6 +199,12 @@ else {
 			$a->cid = $r[0]['id'];
 			$_SESSION['cid'] = $a->cid;
 		}
+		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+			dbesc(datetime_convert()),
+			intval($_SESSION['uid'])
+		);
+
+		call_hooks('logged_in', $a->user);
 
 		header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 		if(($a->module !== 'home') && isset($_SESSION['return_url']))