X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=bc77e5dbc0980c53ef6d15c8b1357634cb7d3e77;hb=c5cf9de32a247bbb1757b1f8e30ab3483544fa31;hp=0a6050a17e1cc92774d6d327c0d013a79afed564;hpb=0c7ae3aeee155425c0e2928ae67df76a7d1fe61e;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index 0a6050a17e..bc77e5dbc0 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());
 		}
 
@@ -57,14 +72,7 @@ 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']))
@@ -72,6 +80,8 @@ else {
 	else {
 		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
@@ -80,7 +90,7 @@ else {
 
 			// if it's an email address or doesn't resolve to a URL, fail.
 
-			if((strpos($temp_string,'@')) || (! validate_url($temp_string))) {
+			if(($noid) || (strpos($temp_string,'@')) || (! validate_url($temp_string))) {
 				$a = get_app();
 				notice( t('Login failed.') . EOL);
 				goaway($a->get_baseurl());
@@ -114,7 +124,7 @@ else {
 				// new account
 				$_SESSION['register'] = 1;
 				$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
-				$openid->optional = array('namePerson/first');
+				$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
 				goaway($openid->authUrl());
 				// NOTREACHED	
 			}
@@ -122,22 +132,44 @@ else {
 	}
 	if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
 
-		// process 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(($r === false) || (! count($r))) {
-			notice( t('Login failed.') . EOL );
-			goaway($a->get_baseurl());
-  		}
+		$addon_auth = array(
+			'name' => trim($_POST['openid_url']), 
+			'password' => trim($_POST['password']),
+			'authenticated' => 0
+		);
+
+		/**
+		 *
+		 * A plugin indicates successful login by setting 'authenticated' to non-zero value
+		 * 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);
+
+		if(! $addon_auth['authenticated']) {
+			// process 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(($r === false) || (! count($r))) {
+				notice( t('Login failed.') . EOL );
+				goaway($a->get_baseurl());
+  			}
+		}
+
 		$_SESSION['uid'] = $r[0]['uid'];
 		$_SESSION['theme'] = $r[0]['theme'];
 		$_SESSION['authenticated'] = 1;
 		$_SESSION['page_flags'] = $r[0]['page-flags'];
 		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
+		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
 		notice( t("Welcome back ") . $r[0]['username'] . EOL);
 		$a->user = $r[0];
@@ -151,6 +183,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']))