X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=33b7d36f91b141e1dbbc944587cd9ac18666d1d4;hb=8db4af3d001cd105d0d769f03395138945209e77;hp=b7292384268a4bc21f94e62b4c242701e54bd4f9;hpb=2ad162f991fdd32122b029398b9ab9e8801c0462;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index b729238426..33b7d36f91 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,89 +1,140 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
+use Friendica\Util\Strings;
+use Friendica\Util\Network;
 
 function redir_init(App $a) {
 
-	$url = ((x($_GET,'url')) ? $_GET['url'] : '');
-	$quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
-	$con_url = ((x($_GET,'conurl')) ? $_GET['conurl'] : '');
+	$url = defaults($_GET, 'url', '');
+	$quiet = !empty($_GET['quiet']) ? '&quiet=1' : '';
+	$con_url = defaults($_GET, 'conurl', '');
 
-	// traditional DFRN
+	if ($a->argc > 1 && intval($a->argv[1])) {
+		$cid = intval($a->argv[1]);
+	} elseif (local_user() && !empty($con_url)) {
+		$cid = Contact::getIdForURL($con_url, local_user());
+	} else {
+		$cid = 0;
+	}
+
+	if (!empty($cid)) {
+		$fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name', 'network', 'poll', 'issued-id', 'dfrn-id', 'duplex', 'pending'];
+		$contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]);
+		if (!DBA::isResult($contact)) {
+			notice(L10n::t('Contact not found.'));
+			$a->internalRedirect();
+		}
 
-	if ($con_url || (local_user() && $a->argc > 1 && intval($a->argv[1]))) {
+		$contact_url = $contact['url'];
 
-		if ($con_url) {
-			$con_url = str_replace('https', 'http', $con_url);
+		if ((!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
+			|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
+		{
+			$a->redirect(defaults($url, $contact_url));
+		}
 
-			$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
-				dbesc($con_url),
-				intval(local_user())
-			);
+		if ($contact['uid'] == 0 && local_user()) {
+			// Let's have a look if there is an established connection
+			// between the public contact we have found and the local user.
+			$contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
 
-			if (!DBM::is_result($r)) {
-				goaway(System::baseUrl());
+			if (DBA::isResult($contact)) {
+				$cid = $contact['id'];
 			}
-			if ($r[0]['network'] !== NETWORK_DFRN) {
-				goaway(($url != '' ? $url : $r[0]['url']));
+
+			if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
+				// Local user is already authenticated.
+				$target_url = defaults($url, $contact_url);
+				Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+				$a->redirect($target_url);
 			}
-			$cid = $r[0]['id'];
+		}
+
+		if (remote_user()) {
+			$host = substr($a->getBaseURL() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos($a->getBaseURL(), '://') + 3);
+			$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
+
+			// On a local instance we have to check if the local user has already authenticated
+			// with the local contact. Otherwise the local user would ask the local contact
+			// for authentification everytime he/she is visiting a profile page of the local
+			// contact.
+			if ($host == $remotehost
+				&& !empty($_SESSION['remote'])
+				&& is_array($_SESSION['remote']))
+			{
+				foreach ($_SESSION['remote'] as $v) {
+					if ($v['uid'] == $_SESSION['visitor_visiting'] && $v['cid'] == $_SESSION['visitor_id']) {
+						// Remote user is already authenticated.
+						$target_url = defaults($url, $contact_url);
+						Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+						$a->redirect($target_url);
+					}
+				}
+			}
+		}
+
+		// When the remote page does support OWA, then we enforce the use of it
+		$basepath = Contact::getBasepath($contact_url);
+		if ($basepath == System::baseUrl()) {
+			$use_magic = true;
 		} else {
-			$cid = $a->argv[1];
+			$serverret = Network::curl($basepath . '/magic');
+			$use_magic = $serverret->isSuccess();
+		}
 
-			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($cid),
-				intval(local_user())
-			);
+		// Doing remote auth with dfrn.
+		if (local_user() && !$use_magic && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
+			$dfrn_id = $orig_id = (($contact['issued-id']) ? $contact['issued-id'] : $contact['dfrn-id']);
 
-			if (!DBM::is_result($r)) {
-				goaway(System::baseUrl());
+			if ($contact['duplex'] && $contact['issued-id']) {
+				$orig_id = $contact['issued-id'];
+				$dfrn_id = '1:' . $orig_id;
 			}
-			if ($r[0]['network'] !== NETWORK_DFRN) {
-				goaway(($url != '' ? $url : $r[0]['url']));
+			if ($contact['duplex'] && $contact['dfrn-id']) {
+				$orig_id = $contact['dfrn-id'];
+				$dfrn_id = '0:' . $orig_id;
 			}
-		}
 
-		$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+			$sec = Strings::getRandomHex();
 
-		if ($r[0]['duplex'] && $r[0]['issued-id']) {
-			$orig_id = $r[0]['issued-id'];
-			$dfrn_id = '1:' . $orig_id;
-		}
-		if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
-			$orig_id = $r[0]['dfrn-id'];
-			$dfrn_id = '0:' . $orig_id;
+			$fields = ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
+				'sec' => $sec, 'expire' => time() + 45];
+			DBA::insert('profile_check', $fields);
+
+			Logger::log('mod_redir: ' . $contact['name'] . ' ' . $sec, Logger::DEBUG);
+
+			$dest = (!empty($url) ? '&destination_url=' . $url : '');
+
+			System::externalRedirect($contact['poll'] . '?dfrn_id=' . $dfrn_id
+				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
 		}
 
-		$sec = random_string();
-
-		q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
-			VALUES( %d, %s, '%s', '%s', %d )",
-			intval(local_user()),
-			intval($cid),
-			dbesc($dfrn_id),
-			dbesc($sec),
-			intval(time() + 45)
-		);
-
-		logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
-		$dest = (($url) ? '&destination_url=' . $url : '');
-		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
-			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
+		$url = defaults($url, $contact_url);
 	}
 
-	if (local_user()) {
-		$handle = $a->user['nickname'] . '@' . substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3);
-	}
-	if (remote_user()) {
-		$handle = $_SESSION['handle'];
-	}
+	// If we don't have a connected contact, redirect with
+	// the 'zrl' parameter.
+	if (!empty($url)) {
+		$my_profile = Profile::getMyURL();
+
+		if (!empty($my_profile) && !Strings::compareLink($my_profile, $url)) {
+			$separator = strpos($url, '?') ? '&' : '?';
+
+			$url .= $separator . 'zrl=' . urlencode($my_profile);
+		}
 
-	if ($url) {
-		$url = str_replace('{zid}','&zid=' . $handle,$url);
-		goaway($url);
+		Logger::log('redirecting to ' . $url, Logger::DEBUG);
+		$a->redirect($url);
 	}
 
-	goaway(System::baseUrl());
+	notice(L10n::t('Contact not found.'));
+	$a->internalRedirect();
 }