X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=9d86f27a9624a70adcc8b86d11e76d4f20a63ee8;hb=4f58c1a5fc6744a5a471e81fd528ac375d10d4b8;hp=3336f882ad03d7263b2ee8a9a40166d5b7476292;hpb=d00ddc01afdef3e626ae0e711e52f830cbdf923a;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 3336f882ad..9d86f27a96 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -2,26 +2,29 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\Protocol;
+use Friendica\Core\Logger;
+use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 function redir_init(App $a) {
 
-	$url = defaults($_GET, 'url', '');
+	$url = $_GET['url'] ?? '';
 	$quiet = !empty($_GET['quiet']) ? '&quiet=1' : '';
-	$con_url = defaults($_GET, 'conurl', '');
 
 	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;
 	}
 
+	// Try magic auth before the legacy stuff
+	redir_magic($a, $cid, $url);
+
 	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()]]);
@@ -32,16 +35,15 @@ function redir_init(App $a) {
 
 		$contact_url = $contact['url'];
 
-		if ($contact['network'] !== Protocol::DFRN // Authentication isn't supported for non DFRN contacts.
-			|| (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
+		if (!Session::isAuthenticated() // Visitors (not logged in or not remotes) can't authenticate.
 			|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
 		{
-			System::externalRedirect($url != '' ? $url : $contact_url);
+			$a->redirect($url ?: $contact_url);
 		}
 
 		if ($contact['uid'] == 0 && local_user()) {
 			// Let's have a look if there is an established connection
-			// between the puplic contact we have found and the local user.
+			// between the public contact we have found and the local user.
 			$contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
 
 			if (DBA::isResult($contact)) {
@@ -50,9 +52,9 @@ function redir_init(App $a) {
 
 			if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
 				// Local user is already authenticated.
-				$target_url = $url != '' ? $url : $contact_url;
-				logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
-				System::externalRedirect($target_url);
+				$target_url = $url ?: $contact_url;
+				Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+				$a->redirect($target_url);
 			}
 		}
 
@@ -64,18 +66,11 @@ function redir_init(App $a) {
 			// 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
-				&& x($_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 = $url != '' ? $url : $contact_url;
-						logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
-						System::externalRedirect($target_url);
-					}
-				}
+			if (($host == $remotehost) && (Session::getRemoteContactID(Session::get('visitor_visiting')) == Session::get('visitor_id'))) {
+				// Remote user is already authenticated.
+				$target_url = $url ?: $contact_url;
+				Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
+				$a->redirect($target_url);
 			}
 		}
 
@@ -92,13 +87,13 @@ function redir_init(App $a) {
 				$dfrn_id = '0:' . $orig_id;
 			}
 
-			$sec = random_string();
+			$sec = Strings::getRandomHex();
 
 			$fields = ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
 				'sec' => $sec, 'expire' => time() + 45];
 			DBA::insert('profile_check', $fields);
 
-			logger('mod_redir: ' . $contact['name'] . ' ' . $sec, LOGGER_DEBUG);
+			Logger::log('mod_redir: ' . $contact['name'] . ' ' . $sec, Logger::DEBUG);
 
 			$dest = (!empty($url) ? '&destination_url=' . $url : '');
 
@@ -106,7 +101,7 @@ function redir_init(App $a) {
 				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
 		}
 
-		$url = $url != '' ? $url : $contact_url;
+		$url = $url ?: $contact_url;
 	}
 
 	// If we don't have a connected contact, redirect with
@@ -114,16 +109,59 @@ function redir_init(App $a) {
 	if (!empty($url)) {
 		$my_profile = Profile::getMyURL();
 
-		if (!empty($my_profile) && !link_compare($my_profile, $url)) {
+		if (!empty($my_profile) && !Strings::compareLink($my_profile, $url)) {
 			$separator = strpos($url, '?') ? '&' : '?';
 
 			$url .= $separator . 'zrl=' . urlencode($my_profile);
 		}
 
-		logger('redirecting to ' . $url, LOGGER_DEBUG);
-		$a->internalRedirect($url);
+		Logger::log('redirecting to ' . $url, Logger::DEBUG);
+		$a->redirect($url);
 	}
 
 	notice(L10n::t('Contact not found.'));
 	$a->internalRedirect();
 }
+
+function redir_magic($a, $cid, $url)
+{
+	$visitor = Profile::getMyURL();
+	if (!empty($visitor)) {
+		Logger::info('Got my url', ['visitor' => $visitor]);
+	}
+
+	$contact = DBA::selectFirst('contact', ['url'], ['id' => $cid]);
+	if (!DBA::isResult($contact)) {
+		Logger::info('Contact not found', ['id' => $cid]);
+		// Shouldn't happen under normal conditions
+		notice(L10n::t('Contact not found.'));
+		if (!empty($url)) {
+			$a->redirect($url);
+		} else {
+			$a->internalRedirect();
+		}
+	} else {
+		$contact_url = $contact['url'];
+		$target_url = $url ?: $contact_url;
+	}
+
+	$basepath = Contact::getBasepath($contact_url);
+
+	// We don't use magic auth when there is no visitor, we are on the same system or we visit our own stuff
+	if (empty($visitor) || Strings::compareLink($basepath, System::baseUrl()) || Strings::compareLink($contact_url, $visitor)) {
+		Logger::info('Redirecting without magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
+		$a->redirect($target_url);
+	}
+
+	// Test for magic auth on the target system
+	$serverret = Network::curl($basepath . '/magic');
+	if ($serverret->isSuccess()) {
+		$separator = strpos($target_url, '?') ? '&' : '?';
+		$target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);
+
+		Logger::info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
+		$a->redirect($target_url);
+	} else {
+		Logger::info('No magic for contact', ['contact' => $contact_url]);
+	}
+}