Merge pull request #12674 from nupplaphil/bug/config_typesafe

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 043f33c313352c940f8e2817f3bb3a860c035b37..09a6cb9e78db781f1ccabac557cd5fbc0747b40c 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,6 +28,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
@@ -61,7 +62,7 @@ class APContact
                                'addr'      => $local_owner['addr'],
                                'baseurl'   => $local_owner['baseurl'],
                                'url'       => $local_owner['url'],
-                               'subscribe' => $local_owner['baseurl'] . '/follow?url={uri}'];
+                               'subscribe' => $local_owner['baseurl'] . '/contact/follow?url={uri}'];
 
                        if (!empty($local_owner['alias']) && ($local_owner['url'] != $local_owner['alias'])) {
                                $data['alias'] = $local_owner['alias'];
@@ -225,14 +226,11 @@ class APContact
                $apcontact['following'] = JsonLD::fetchElement($compacted, 'as:following', '@id');
                $apcontact['followers'] = JsonLD::fetchElement($compacted, 'as:followers', '@id');
                $apcontact['inbox'] = (JsonLD::fetchElement($compacted, 'ldp:inbox', '@id') ?? '');
-               self::unarchiveInbox($apcontact['inbox'], false);
-
                $apcontact['outbox'] = JsonLD::fetchElement($compacted, 'as:outbox', '@id');
 
                $apcontact['sharedinbox'] = '';
                if (!empty($compacted['as:endpoints'])) {
                        $apcontact['sharedinbox'] = (JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id') ?? '');
-                       self::unarchiveInbox($apcontact['sharedinbox'], true);
                }
 
                $apcontact['featured']      = JsonLD::fetchElement($compacted, 'toot:featured', '@id');
@@ -290,22 +288,19 @@ class APContact
                        return $fetched_contact;
                }
 
-               $parts = parse_url($apcontact['url']);
-               unset($parts['scheme']);
-               unset($parts['path']);
-
                if (empty($apcontact['addr'])) {
-                       if (!empty($apcontact['nick']) && is_array($parts)) {
-                               $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
-                       } else {
+                       try {
+                               $apcontact['addr'] = $apcontact['nick'] . '@' . (new Uri($apcontact['url']))->getAuthority();
+                       } catch (\Throwable $e) {
+                               Logger::warning('Unable to coerce APContact URL into a UriInterface object', ['url' => $apcontact['url'], 'error' => $e->getMessage()]);
                                $apcontact['addr'] = '';
                        }
                }
 
                $apcontact['pubkey'] = null;
                if (!empty($compacted['w3id:publicKey'])) {
-                       $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value'));
-                       if (strstr($apcontact['pubkey'], 'RSA ')) {
+                       $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value') ?? '');
+                       if (strpos($apcontact['pubkey'], 'RSA ') !== false) {
                                $apcontact['pubkey'] = Crypto::rsaToPem($apcontact['pubkey']);
                        }
                }
@@ -382,7 +377,7 @@ class APContact
                // kroeg:blocks, updated
 
                // When the photo is too large, try to shorten it by removing parts
-               if (strlen($apcontact['photo']) > 255) {
+               if (strlen($apcontact['photo'] ?? '') > 255) {
                        $parts = parse_url($apcontact['photo']);
                        unset($parts['fragment']);
                        $apcontact['photo'] = (string)Uri::fromParts($parts);
@@ -429,6 +424,12 @@ class APContact
                        $apcontact['gsid'] = null;
                }
 
+               self::unarchiveInbox($apcontact['inbox'], false, $apcontact['gsid']);
+
+               if (!empty($apcontact['sharedinbox'])) {
+                       self::unarchiveInbox($apcontact['sharedinbox'], true, $apcontact['gsid']);
+               }
+
                if ($apcontact['url'] == $apcontact['alias']) {
                        $apcontact['alias'] = null;
                }
@@ -495,13 +496,13 @@ class APContact
        private static function getStatusesCount(array $owner): int
        {
                $condition = [
-                       'private' => [Item::PUBLIC, Item::UNLISTED],
+                       'private'        => [Item::PUBLIC, Item::UNLISTED],
                        'author-id'      => Contact::getIdForURL($owner['url'], 0, false),
-                       'gravity'        => [GRAVITY_PARENT, GRAVITY_COMMENT],
+                       'gravity'        => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
                        'network'        => Protocol::DFRN,
                        'parent-network' => Protocol::FEDERATED,
                        'deleted'        => false,
-                       'visible'        => true
+                       'visible'        => true,
                ];
 
                $count = Post::countPosts($condition);
@@ -519,7 +520,7 @@ class APContact
        {
                if (!empty($apcontact['inbox'])) {
                        Logger::info('Set inbox status to failure', ['inbox' => $apcontact['inbox']]);
-                       HTTPSignature::setInboxStatus($apcontact['inbox'], false);
+                       HTTPSignature::setInboxStatus($apcontact['inbox'], false, false, $apcontact['gsid']);
                }
 
                if (!empty($apcontact['sharedinbox'])) {
@@ -529,7 +530,7 @@ class APContact
                        if (!$available) {
                                // If all known personal inboxes are failing then set their shared inbox to failure as well
                                Logger::info('Set shared inbox status to failure', ['sharedinbox' => $apcontact['sharedinbox']]);
-                               HTTPSignature::setInboxStatus($apcontact['sharedinbox'], false, true);
+                               HTTPSignature::setInboxStatus($apcontact['sharedinbox'], false, true, $apcontact['gsid']);
                        }
                }
        }
@@ -544,11 +545,11 @@ class APContact
        {
                if (!empty($apcontact['inbox'])) {
                        Logger::info('Set inbox status to success', ['inbox' => $apcontact['inbox']]);
-                       HTTPSignature::setInboxStatus($apcontact['inbox'], true);
+                       HTTPSignature::setInboxStatus($apcontact['inbox'], true, false, $apcontact['gsid']);
                }
                if (!empty($apcontact['sharedinbox'])) {
                        Logger::info('Set shared inbox status to success', ['sharedinbox' => $apcontact['sharedinbox']]);
-                       HTTPSignature::setInboxStatus($apcontact['sharedinbox'], true, true);
+                       HTTPSignature::setInboxStatus($apcontact['sharedinbox'], true, true, $apcontact['gsid']);
                }
        }
 
@@ -557,15 +558,16 @@ class APContact
         *
         * @param string  $url    inbox url
         * @param boolean $shared Shared Inbox
+        * @param int     $gsid   Global server id
         * @return void
         */
-       private static function unarchiveInbox(string $url, bool $shared)
+       private static function unarchiveInbox(string $url, bool $shared, int $gsid = null)
        {
                if (empty($url)) {
                        return;
                }
 
-               HTTPSignature::setInboxStatus($url, true, $shared);
+               HTTPSignature::setInboxStatus($url, true, $shared, $gsid);
        }
 
        /**
@@ -573,7 +575,7 @@ class APContact
         *
         * @param array $apcontact
         *
-        * @return bool 
+        * @return bool
         */
        public static function isRelay(array $apcontact): bool
        {