Merge pull request #12952 from MrPetovan/bug/fatal-errors

Address a few fatal errors

src/Core/Session/Capability/IHandleUserSessions.php

@@ -109,6 +109,8 @@ interface IHandleUserSessions extends IHandleSessions
 
 	/**
 	 * Set the session variable that contains the contact IDs for the visitor's contact URL
+	 *
+	 * @param string $my_url
 	 */
-	public function setVisitorsContacts();
+	public function setVisitorsContacts(string $my_url);
 }

src/Core/Session/Model/UserSession.php

@@ -140,9 +140,9 @@ class UserSession implements IHandleUserSessions
 	}
 
 	/** {@inheritDoc} */
-	public function setVisitorsContacts()
+	public function setVisitorsContacts(string $my_url)
 	{
-		$this->session->set('remote', Contact::getVisitorByUrl($this->session->get('my_url')));
+		$this->session->set('remote', Contact::getVisitorByUrl($my_url));
 	}
 
 	/** {@inheritDoc} */

src/Factory/Api/Mastodon/Relationship.php

@@ -22,6 +22,7 @@
 namespace Friendica\Factory\Api\Mastodon;
 
 use Exception;
+use Friendica\Network\HTTPException;
 use Friendica\Object\Api\Mastodon\Relationship as RelationshipEntity;
 use Friendica\BaseFactory;
 use Friendica\Model\Contact;
@@ -41,9 +42,15 @@ class Relationship extends BaseFactory
 		$pcid  = !empty($cdata['public']) ? $cdata['public'] : $contactId;
 		$cid   = !empty($cdata['user']) ? $cdata['user'] : $contactId;
 
+		$contact = Contact::getById($cid);
+		if (!$contact) {
+			$this->logger->warning('Target contact not found', ['contactId' => $contactId, 'uid' => $uid, 'pcid' => $pcid, 'cid' => $cid]);
+			throw new HTTPException\NotFoundException('Contact not found.');
+		}
+
 		return new RelationshipEntity(
 			$pcid,
-			Contact::getById($cid),
+			$contact,
 			Contact\User::isBlocked($cid, $uid),
 			Contact\User::isIgnored($cid, $uid)
 		);

src/Model/Profile.php

@@ -795,14 +795,16 @@ class Profile
 		$visitor = Contact::getById($cid);
 
 		// Authenticate the visitor.
-		$_SESSION['authenticated'] = 1;
+		DI::userSession()->setMultiple([
-		$_SESSION['visitor_id'] = $visitor['id'];
+			'authenticated'  => 1,
-		$_SESSION['visitor_handle'] = $visitor['addr'];
+			'visitor_id'     => $visitor['id'],
-		$_SESSION['visitor_home'] = $visitor['url'];
+			'visitor_handle' => $visitor['addr'],
-		$_SESSION['my_url'] = $visitor['url'];
+			'visitor_home'   => $visitor['url'],
-		$_SESSION['remote_comment'] = $visitor['subscribe'];
+			'my_url'         => $visitor['url'],
+			'remote_comment' => $visitor['subscribe'],
+		]);
 
-		DI::userSession()->setVisitorsContacts();
+		DI::userSession()->setVisitorsContacts($visitor['url']);
 
 		$a->setContactId($visitor['id']);
 

src/Module/Contact/Follow.php

@@ -40,6 +40,7 @@ use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Network\Probe;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
+use GuzzleHttp\Psr7\Uri;
 use Psr\Log\LoggerInterface;
 
 class Follow extends BaseModule
@@ -223,17 +224,26 @@ class Follow extends BaseModule
 
 	protected function followRemoteItem(string $url)
 	{
-		$itemId = Item::fetchByLink($url, $this->session->getLocalUserId());
+		try {
-		if (!$itemId) {
+			$uri = new Uri($url);
-			// If the user-specific search failed, we search and probe a public post
+			if (!$uri->getScheme()) {
-			$itemId = Item::fetchByLink($url);
+				return;
-		}
-
-		if (!empty($itemId)) {
-			$item = Post::selectFirst(['guid'], ['id' => $itemId]);
-			if (!empty($item['guid'])) {
-				$this->baseUrl->redirect('display/' . $item['guid']);
 			}
+
+			$itemId = Item::fetchByLink($url, $this->session->getLocalUserId());
+			if (!$itemId) {
+				// If the user-specific search failed, we search and probe a public post
+				$itemId = Item::fetchByLink($url);
+			}
+
+			if (!empty($itemId)) {
+				$item = Post::selectFirst(['guid'], ['id' => $itemId]);
+				if (!empty($item['guid'])) {
+					$this->baseUrl->redirect('display/' . $item['guid']);
+				}
+			}
+		} catch (\InvalidArgumentException $e) {
+			return;
 		}
 	}
 }

src/Module/Profile/Contacts.php

@@ -121,11 +121,14 @@ class Contacts extends Module\BaseProfile
 					['uri-id' => $contact['uri-id'], 'uid' => [0, $this->userSession->getLocalUserId()]],
 					['order' => ['uid' => 'DESC']]
 				);
-				return Module\Contact::getContactTemplateVars($contact);
+				return $contact ? Module\Contact::getContactTemplateVars($contact) : null;
 			},
 			Model\Contact::selectToArray(['uri-id'], $condition, $params)
 		);
 
+		// Remove nonexistent contacts
+		$contacts = array_filter($contacts);
+
 		$desc = '';
 		switch ($type) {
 			case 'followers':

src/Object/Api/Mastodon/Relationship.php

@@ -77,7 +77,7 @@ class Relationship extends BaseDataTransferObject
 	 * @param bool  $blocked "true" if user is blocked
 	 * @param bool  $muted "true" if user is muted
 	 */
-	public function __construct(int $contactId, array $contactRecord = [], bool $blocked = false, bool $muted = false)
+	public function __construct(int $contactId, array $contactRecord, bool $blocked = false, bool $muted = false)
 	{
 		$this->id                   = (string)$contactId;
 		$this->following            = false;

src/Security/Authentication.php

@@ -323,19 +323,21 @@ class Authentication
 	 */
 	public function setForUser(App $a, array $user_record, bool $login_initial = false, bool $interactive = false, bool $login_refresh = false)
 	{
+		$my_url = $this->baseUrl . '/profile/' . $user_record['nickname'];
+
 		$this->session->setMultiple([
 			'uid'           => $user_record['uid'],
 			'theme'         => $user_record['theme'],
 			'mobile-theme'  => $this->pConfig->get($user_record['uid'], 'system', 'mobile_theme'),
 			'authenticated' => 1,
 			'page_flags'    => $user_record['page-flags'],
-			'my_url'        => $this->baseUrl . '/profile/' . $user_record['nickname'],
+			'my_url'        => $my_url,
 			'my_address'    => $user_record['nickname'] . '@' . substr($this->baseUrl, strpos($this->baseUrl, '://') + 3),
 			'addr'          => $this->remoteAddress,
 			'nickname'      => $user_record['nickname'],
 		]);
 
-		$this->session->setVisitorsContacts();
+		$this->session->setVisitorsContacts($my_url);
 
 		$member_since = strtotime($user_record['register_date']);
 		$this->session->set('new_member', time() < ($member_since + (60 * 60 * 24 * 14)));