Merge remote-tracking branch 'upstream/develop' into warning

src/Content/Conversation.php

@@ -146,7 +146,7 @@ class Conversation
 					'url'     => $activity['author-link']
 				];
 				$url = Contact::magicLinkByContact($author);
-				if (strpos($url, 'redir/') === 0) {
+				if (strpos($url, 'contact/redir/') === 0) {
 					$sparkle = ' class="sparkle" ';
 				}
 
@@ -612,7 +612,7 @@ class Conversation
 					$profile_link = Contact::magicLinkByContact($author);
 
 					$sparkle = '';
-					if (strpos($profile_link, 'redir/') === 0) {
+					if (strpos($profile_link, 'contact/redir/') === 0) {
 						$sparkle = ' sparkle';
 					}
 

src/Content/Item.php

@@ -345,7 +345,7 @@ class Item
 			'url' => $item['author-link'],
 		];
 		$profile_link = Contact::magicLinkByContact($author, $item['author-link']);
-		$sparkle = (strpos($profile_link, 'redir/') === 0);
+		$sparkle = (strpos($profile_link, 'contact/redir/') === 0);
 
 		$cid = 0;
 		$pcid = $item['author-id'];

src/Content/Text/BBCode.php

@@ -2090,7 +2090,7 @@ class BBCode
 				$text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism', '<$1$2=$3&$4>', $text);
 
 				// sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails)
-				$allowed_src_protocols = ['//', 'http://', 'https://', 'redir/', 'cid:'];
+				$allowed_src_protocols = ['//', 'http://', 'https://', 'contact/redir/', 'cid:'];
 
 				array_walk($allowed_src_protocols, function(&$value) { $value = preg_quote($value, '#');});
 
@@ -2105,7 +2105,7 @@ class BBCode
 				$allowed_link_protocols[] = '//';
 				$allowed_link_protocols[] = 'http://';
 				$allowed_link_protocols[] = 'https://';
-				$allowed_link_protocols[] = 'redir/';
+				$allowed_link_protocols[] = 'contact/redir/';
 
 				array_walk($allowed_link_protocols, function(&$value) { $value = preg_quote($value, '#');});
 

src/Content/Text/HTML.php

@@ -840,7 +840,7 @@ class HTML
 
 		if ($redirect) {
 			$url = Contact::magicLinkByContact($contact);
-			if (strpos($url, 'redir/') === 0) {
+			if (strpos($url, 'contact/redir/') === 0) {
 				$sparkle = ' sparkle';
 			}
 		}

src/Model/Contact.php

@@ -1149,7 +1149,7 @@ class Contact
 		$sparkle = false;
 		if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
 			$sparkle = true;
-			$profile_link = DI::baseUrl() . '/redir/' . $contact['id'];
+			$profile_link = 'contact/redir/' . $contact['id'];
 		} else {
 			$profile_link = $contact['url'];
 		}
@@ -1165,12 +1165,12 @@ class Contact
 		}
 
 		if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) {
-			$pm_url = DI::baseUrl() . '/message/new/' . $contact['id'];
+			$pm_url = 'message/new/' . $contact['id'];
 		}
 
-		$contact_url = DI::baseUrl() . '/contact/' . $contact['id'];
+		$contact_url = 'contact/' . $contact['id'];
 
-		$posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
+		$posts_link = 'contact/' . $contact['id'] . '/conversations';
 
 		$follow_link = '';
 		$unfollow_link = '';
@@ -3324,7 +3324,7 @@ class Contact
 			return $destination;
 		}
 
-		$redirect = 'redir/' . $contact['id'];
+		$redirect = 'contact/redir/' . $contact['id'];
 
 		if (($url != '') && !Strings::compareLink($contact['url'], $url)) {
 			$redirect .= '?url=' . $url;

src/Module/Contact.php

@@ -529,7 +529,7 @@ class Contact extends BaseModule
 
 		$url = Model\Contact::magicLinkByContact($contact);
 
-		if (strpos($url, 'redir/') === 0) {
+		if (strpos($url, 'contact/redir/') === 0) {
 			$sparkle = ' class="sparkle" ';
 		} else {
 			$sparkle = '';

src/Module/Contact/Hovercard.php

@@ -44,14 +44,12 @@ class Hovercard extends BaseModule
 			throw new HTTPException\ForbiddenException();
 		}
 
-		// If a contact is connected the url is internally changed to 'redir/CID'. We need the pure url to search for
+		// If a contact is connected the url is internally changed to 'contact/redir/CID'. We need the pure url to search for
 		// the contact. So we strip out the contact id from the internal url and look in the contact table for
 		// the real url (nurl)
-		if (strpos($contact_url, 'redir/') === 0) {
+		if (strpos($contact_url, 'contact/redir/') === 0) {
 			$cid = intval(substr($contact_url, 6));
-		}
-
-		if (strpos($contact_url, 'contact/') === 0) {
+		} elseif (strpos($contact_url, 'contact/') === 0) {
 			$cid = intval(substr($contact_url, 8));
 		}
 

src/Module/Contact/Profile.php

@@ -239,7 +239,7 @@ class Profile extends BaseModule
 		}
 
 		$url = Contact::magicLinkByContact($contact);
-		if (strpos($url, 'redir/') === 0) {
+		if (strpos($url, 'contact/redir/') === 0) {
 			$sparkle = ' class="sparkle" ';
 		} else {
 			$sparkle = '';

src/Module/Contact/Redir.php

@@ -0,0 +1,224 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Contact;
+
+use Friendica\Core\L10n;
+use Friendica\App;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Database\Database;
+use Friendica\Model\Contact;
+use Friendica\Module\Response;
+use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
+use Friendica\Util\Strings;
+use Psr\Log\LoggerInterface;
+
+class Redir extends \Friendica\BaseModule
+{
+	/** @var IHandleUserSessions */
+	private $session;
+	/** @var Database */
+	private $database;
+	/** @var App */
+	private $app;
+	/** @var ICanSendHttpRequests */
+	private $httpClient;
+
+	public function __construct(ICanSendHttpRequests $httpClient, App $app, Database $database, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->session    = $session;
+		$this->database   = $database;
+		$this->app        = $app;
+		$this->httpClient = $httpClient;
+	}
+
+	protected function rawContent(array $request = [])
+	{
+		if (!$this->session->isAuthenticated()) {
+			throw new HTTPException\ForbiddenException($this->t('Access denied.'));
+		}
+
+		$url = $request['url'] ?? '';
+
+		$cid = $this->parameters['id'] ?? 0;
+
+		// Try magic auth before the legacy stuff
+		$this->magic($cid, $url);
+
+		$this->legacy($cid, $url);
+	}
+
+	/**
+	 * @param int    $cid
+	 * @param string $url
+	 * @return void
+	 * @throws HTTPException\ForbiddenException
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws HTTPException\NotFoundException
+	 * @throws \ImagickException
+	 */
+	private function magic(int $cid, string $url)
+	{
+		$visitor = $this->session->getMyUrl();
+		if (!empty($visitor)) {
+			$this->logger->info('Got my url', ['visitor' => $visitor]);
+		}
+
+		$contact = $this->database->selectFirst('contact', ['url'], ['id' => $cid]);
+		if (!$contact) {
+			$this->logger->info('Contact not found', ['id' => $cid]);
+			throw new HTTPException\NotFoundException($this->t('Contact not found.'));
+		} else {
+			$contact_url = $contact['url'];
+			$this->checkUrl($contact_url, $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, $this->baseUrl) || Strings::compareLink($contact_url, $visitor)) {
+			$this->logger->info('Redirecting without magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
+			$this->app->redirect($target_url);
+		}
+
+		// Test for magic auth on the target system
+		$response = $this->httpClient->head($basepath . '/magic', [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::HTML]);
+		if ($response->isSuccess()) {
+			$separator = strpos($target_url, '?') ? '&' : '?';
+			$target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);
+
+			$this->logger->info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
+			$this->app->redirect($target_url);
+		} else {
+			$this->logger->info('No magic for contact', ['contact' => $contact_url]);
+		}
+	}
+
+	/**
+	 * @param int    $cid
+	 * @param string $url
+	 * @return void
+	 * @throws HTTPException\BadRequestException
+	 * @throws HTTPException\ForbiddenException
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws HTTPException\NotFoundException
+	 */
+	private function legacy(int $cid, string $url): void
+	{
+		if (empty($cid)) {
+			throw new HTTPException\BadRequestException($this->t('Bad Request.'));
+		}
+
+		$fields  = ['id', 'uid', 'nurl', 'url', 'addr', 'name'];
+		$contact = $this->database->selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, $this->session->getLocalUserId()]]);
+		if (!$contact) {
+			throw new HTTPException\NotFoundException($this->t('Contact not found.'));
+		}
+
+		$contact_url = $contact['url'];
+
+		if (!empty($this->app->getContactId()) && $this->app->getContactId() == $cid) {
+			// Local user is already authenticated.
+			$this->checkUrl($contact_url, $url);
+			$this->app->redirect($url ?: $contact_url);
+		}
+
+		if ($contact['uid'] == 0 && $this->session->getLocalUserId()) {
+			// Let's have a look if there is an established connection
+			// between the public contact we have found and the local user.
+			$contact = $this->database->selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => $this->session->getLocalUserId()]);
+			if ($contact) {
+				$cid = $contact['id'];
+			}
+
+			if (!empty($this->app->getContactId()) && $this->app->getContactId() == $cid) {
+				// Local user is already authenticated.
+				$this->checkUrl($contact_url, $url);
+				$target_url = $url ?: $contact_url;
+				$this->logger->info($contact['name'] . " is already authenticated. Redirecting to " . $target_url);
+				$this->app->redirect($target_url);
+			}
+		}
+
+		if ($this->session->getRemoteUserId()) {
+			$host       = substr($this->baseUrl->getUrlPath() . ($this->baseUrl->getUrlPath() ? '/' . $this->baseUrl->getUrlPath() : ''), strpos($this->baseUrl->getUrlPath(), '://') + 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) && ($this->session->getRemoteContactID($this->session->get('visitor_visiting')) == $this->session->get('visitor_id'))) {
+				// Remote user is already authenticated.
+				$this->checkUrl($contact_url, $url);
+				$target_url = $url ?: $contact_url;
+				$this->logger->info($contact['name'] . " is already authenticated. Redirecting to " . $target_url);
+				$this->app->redirect($target_url);
+			}
+		}
+
+		if (empty($url)) {
+			throw new HTTPException\BadRequestException($this->t('Bad Request.'));
+		}
+
+		// If we don't have a connected contact, redirect with
+		// the 'zrl' parameter.
+		$my_profile = $this->session->getMyUrl();
+
+		if (!empty($my_profile) && !Strings::compareLink($my_profile, $url)) {
+			$separator = strpos($url, '?') ? '&' : '?';
+
+			$url .= $separator . 'zrl=' . urlencode($my_profile);
+		}
+
+		$this->logger->info('redirecting to ' . $url);
+		$this->app->redirect($url);
+	}
+
+
+	private function checkUrl(string $contact_url, string $url)
+	{
+		if (empty($contact_url) || empty($url)) {
+			return;
+		}
+
+		$url_host = parse_url($url, PHP_URL_HOST);
+		if (empty($url_host)) {
+			$url_host = parse_url($this->baseUrl, PHP_URL_HOST);
+		}
+
+		$contact_url_host = parse_url($contact_url, PHP_URL_HOST);
+
+		if ($url_host == $contact_url_host) {
+			return;
+		}
+
+		$this->logger->error('URL check host mismatch', ['contact' => $contact_url, 'url' => $url]);
+		throw new HTTPException\ForbiddenException($this->t('Access denied.'));
+	}
+}

src/Object/Post.php

@@ -280,7 +280,7 @@ class Post
 			$profile_link = $item['author-link'];
 		}
 
-		if (strpos($profile_link, 'redir/') === 0) {
+		if (strpos($profile_link, 'contact/redir/') === 0) {
 			$sparkle = ' sparkle';
 		}