X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=2c284f76d88757848459a339cfbe98bdafcfdcb9;hb=132653ac562d28bdc10eb836628daec8175cd378;hp=0be48060e6d4de7a5fcf5351349bcdebd77602fb;hpb=e193091dfe348c5430c3a303947dbe7a6eced374;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
old mode 100755
new mode 100644
index 0be48060e6..2c284f76d8
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -1,87 +1,119 @@
 <?php
+/**
+ * @file mod/openid.php
+ */
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
-require_once('library/openid.php');
+function openid_content(App $a) {
 
-
-function openid_content(&$a) {
-
-	$noid = get_config('system','no_openid');
+	$noid = Config::get('system','no_openid');
 	if($noid)
-		goaway(z_root());
+		goaway(System::baseUrl());
 
 	logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
 
 	if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
-		$openid = new LightOpenID;
 
-		if($openid->validate()) {
+		$openid = new LightOpenID($a->get_hostname());
 
-			if(x($_SESSION,'register')) {
-				unset($_SESSION['register']);
-				$args = '';
-				$attr = $openid->getAttributes();
-				if(is_array($attr) && count($attr)) {
-					foreach($attr as $k => $v) {
-						if($k === 'namePerson/friendly')
-							$nick = notags(trim($v));
-						if($k === 'namePerson/first')
-							$first = notags(trim($v));
-						if($k === 'namePerson')
-							$args .= '&username=' . notags(trim($v));
-						if($k === 'contact/email')
-							$args .= '&email=' . notags(trim($v));
-						if($k === 'media/image/aspect11')
-							$photosq = bin2hex(trim($v));
-						if($k === 'media/image/default')
-							$photo = bin2hex(trim($v));
-					}
-				}
-				if($nick)
-					$args .= '&nickname=' . $nick;
-				elseif($first)
-					$args .= '&nickname=' . $first;
+		if($openid->validate()) {
 
-				if($photosq)
-					$args .= '&photo=' . $photosq;
-				elseif($photo)
-					$args .= '&photo=' . $photo;
+			$authid = $_REQUEST['openid_identity'];
+
+			if(! strlen($authid)) {
+				logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
+				goaway(System::baseUrl());
+			}
+
+			// NOTE: we search both for normalised and non-normalised form of $authid
+			//       because the normalization step was removed from setting
+			//       mod/settings.php in 8367cad so it might have left mixed
+			//       records in the user table
+			//
+			$r = q("SELECT *
+				FROM `user`
+				WHERE ( `openid` = '%s' OR `openid` = '%s' )
+				AND `blocked` = 0 AND `account_expired` = 0
+				AND `account_removed` = 0 AND `verified` = 1
+				LIMIT 1",
+				dbesc($authid), dbesc(normalise_openid($authid))
+			);
 
-				$args .= '&openid_url=' . notags(trim($_SESSION['openid']));
-				if($a->config['register_policy'] != REGISTER_CLOSED)
-					goaway($a->get_baseurl() . '/register' . $args);
-				else
-					goaway(z_root());
+			if (DBM::is_result($r)) {
 
-				// NOTREACHED
-			} 
+				// successful OpenID login
 
-			$authid = normalise_openid($_REQUEST['openid_identity']);
-			if(! strlen($authid))
-				goaway(z_root());
+				unset($_SESSION['openid']);
 
+				require_once('include/security.php');
+				authenticate_success($r[0],true,true);
 
-			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
-				FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
-				dbesc($authid)
-			);
+				// just in case there was no return url set
+				// and we fell through
 
-			if(! count($r)) {
-				notice( t('Login failed.') . EOL );
-				goaway(z_root());
-  			}
-			unset($_SESSION['openid']);
+				goaway(System::baseUrl());
+			}
 
-			require_once('include/security.php');
-			authenticate_success($r[0],true,true);
+			// Successful OpenID login - but we can't match it to an existing account.
+			// New registration?
 
-			// just in case there was no return url set 
-			// and we fell through
+			if ($a->config['register_policy'] == REGISTER_CLOSED) {
+				notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
+				goaway(System::baseUrl());
+			}
 
-			goaway(z_root());
+			unset($_SESSION['register']);
+			$args = '';
+			$attr = $openid->getAttributes();
+			if (is_array($attr) && count($attr)) {
+				foreach ($attr as $k => $v) {
+					if ($k === 'namePerson/friendly') {
+						$nick = notags(trim($v));
+					}
+					if($k === 'namePerson/first') {
+						$first = notags(trim($v));
+					}
+					if($k === 'namePerson') {
+						$args .= '&username=' . urlencode(notags(trim($v)));
+					}
+					if ($k === 'contact/email') {
+						$args .= '&email=' . urlencode(notags(trim($v)));
+					}
+					if ($k === 'media/image/aspect11') {
+						$photosq = bin2hex(trim($v));
+					}
+					if ($k === 'media/image/default') {
+						$photo = bin2hex(trim($v));
+					}
+				}
+			}
+			if ($nick) {
+				$args .= '&nickname=' . urlencode($nick);
+			}
+			elseif ($first) {
+				$args .= '&nickname=' . urlencode($first);
+			}
+
+			if ($photosq) {
+				$args .= '&photo=' . urlencode($photosq);
+			}
+			elseif ($photo) {
+				$args .= '&photo=' . urlencode($photo);
+			}
+
+			$args .= '&openid_url=' . urlencode(notags(trim($authid)));
+
+			goaway(System::baseUrl() . '/register?' . $args);
+
+			// NOTREACHED
 		}
 	}
-	notice( t('Login failed.') . EOL);
-	goaway(z_root());
+	notice(L10n::t('Login failed.') . EOL);
+	goaway(System::baseUrl());
 	// NOTREACHED
 }