Improved relay post processing

[friendica.git] / src / Protocol / ActivityPub / Receiver.php

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 992b428c35740c0ed22c0dc241d08a19a248a18e..bb671003da58d292bbd0b0a76ed49032d8572848 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -108,7 +108,7 @@ class Receiver
                if (empty($apcontact)) {
                        Logger::notice('Unable to retrieve AP contact for actor - message is discarded', ['actor' => $actor]);
                        return;
-               } elseif (APContact::isRelay($apcontact)) {
+               } elseif (APContact::isRelay($apcontact) && self::isRelayPost($ldactivity)) {
                        self::processRelayPost($ldactivity, $actor);
                        return;
                } else {
@@ -116,7 +116,7 @@ class Receiver
                }
 
                $sig_contact = HTTPSignature::getKeyIdContact($header);
-               if (APContact::isRelay($sig_contact)) {
+               if (APContact::isRelay($sig_contact) && self::isRelayPost($ldactivity)) {
                        Logger::info('Message from a relay', ['url' => $sig_contact['url']]);
                        self::processRelayPost($ldactivity, $sig_contact['url']);
                        return;
@@ -170,26 +170,23 @@ class Receiver
        }
 
        /**
-        * Process incoming posts from relays
+        * Check if the activity is a post rhat can be send via a relay
         *
-        * @param array  $activity
-        * @param string $actor
-        * @return void
+        * @param array $activity
+        * @return boolean
         */
-       private static function processRelayPost(array $activity, string $actor)
+       private static function isRelayPost(array $activity): bool
        {
                $type = JsonLD::fetchElement($activity, '@type');
                if (!$type) {
-                       Logger::notice('Empty type', ['activity' => $activity, 'actor' => $actor]);
-                       return;
+                       return false;
                }
 
                $object_type = JsonLD::fetchElement($activity, 'as:object', '@type') ?? '';
 
                $object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
                if (empty($object_id)) {
-                       Logger::notice('No object id found', ['type' => $type, 'object_type' => $object_type, 'actor' => $actor, 'activity' => $activity]);
-                       return;
+                       return false;
                }
 
                $handle = ($type == 'as:Announce');
@@ -197,26 +194,29 @@ class Receiver
                if (!$handle && in_array($type, ['as:Create', 'as:Update'])) {
                        $handle = in_array($object_type, self::CONTENT_TYPES);
                }
+               return $handle;
+       }
 
-               if (!$handle) {
-                       $trust_source = false;
-                       $object_data = self::prepareObjectData($activity, 0, false, $trust_source);
-
-                       if (!$trust_source) {
-                               Logger::notice('Activity trust could not be achieved.',  ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
-                               return;
-                       }
+       /**
+        * Process incoming posts from relays
+        *
+        * @param array  $activity
+        * @param string $actor
+        * @return void
+        */
+       private static function processRelayPost(array $activity, string $actor)
+       {
+               $type = JsonLD::fetchElement($activity, '@type');
+               if (!$type) {
+                       Logger::notice('Empty type', ['activity' => $activity, 'actor' => $actor]);
+                       return;
+               }
 
-                       if (empty($object_data)) {
-                               Logger::notice('No object data found', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
-                               return;
-                       }
+               $object_type = JsonLD::fetchElement($activity, 'as:object', '@type') ?? '';
 
-                       if (self::routeActivities($object_data, $type, true)) {
-                               Logger::debug('Handled activity', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor]);
-                       } else {
-                               Logger::info('Unhandled activity', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
-                       }
+               $object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
+               if (empty($object_id)) {
+                       Logger::notice('No object id found', ['type' => $type, 'object_type' => $object_type, 'actor' => $actor, 'activity' => $activity]);
                        return;
                }
 
@@ -231,7 +231,7 @@ class Receiver
                        return;
                }
 
-               Logger::debug('Got relayed message id', ['id' => $object_id, 'actor' => $actor]);
+               Logger::debug('Process post from relay server', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor]);
 
                $item_id = Item::searchByLink($object_id);
                if ($item_id) {
@@ -239,10 +239,21 @@ class Receiver
                        return;
                }
 
-               $id = Processor::fetchMissingActivity($object_id, [], $actor, self::COMPLETION_RELAY);
-               if (empty($id)) {
-                       Logger::notice('Relayed message had not been fetched', ['id' => $object_id, 'actor' => $actor]);
-                       return;
+               if (!DI::config()->get('system', 'decoupled_receiver')) {
+                       $id = Processor::fetchMissingActivity($object_id, [], $actor, self::COMPLETION_RELAY);
+                       if (!empty($id)) {
+                               Logger::notice('Relayed message is fetched', ['result' => $id, 'id' => $object_id, 'actor' => $actor]);
+                       } else {
+                               Logger::notice('Relayed message had not been fetched', ['id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
+                       }
+               } elseif (!Fetch::hasWorker($object_id)) {
+                       Logger::notice('Fetching is done by worker.', ['id' => $object_id]);
+                       Fetch::add($object_id);
+                       $activity['recursion-depth'] = 0;
+                       $wid = Worker::add(Worker::PRIORITY_HIGH, 'FetchMissingActivity', $object_id, [], $actor, self::COMPLETION_RELAY);
+                       Fetch::setWorkerId($object_id, $wid);
+               } else {
+                       Logger::debug('Activity will already be fetched via a worker.', ['url' => $object_id]);
                }
        }