Merge pull request #11780 from annando/untrusted

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index aa169ab028b31c508f06b27da8d60de08ed1e6eb..2025aba04ef83366aeae16b8f0c7ea7f530d25cf 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -45,7 +45,9 @@ use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\HTTPSignature;
 use Friendica\Util\JsonLD;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 
@@ -301,6 +303,11 @@ class Processor
                        Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
                        if ($recursion_depth < 10) {
                                $result = self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
+                               if (empty($result) && self::isActivityGone($activity['reply-to-id'])) {
+                                       // Recursively delete this and all depending entries
+                                       Queue::deleteById($activity['entry-id']);
+                                       return [];
+                               }
                                $fetch_by_worker = empty($result);
                        } else {
                                Logger::notice('Recursion level is too high.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
@@ -354,8 +361,6 @@ class Processor
                if (!empty($activity['raw'])) {
                        $item['source'] = $activity['raw'];
                        $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
-                       $item['conversation-href'] = $activity['context'] ?? '';
-                       $item['conversation-uri'] = $activity['conversation'] ?? '';
 
                        if (isset($activity['push'])) {
                                $item['direction'] = $activity['push'] ? Conversation::PUSH : Conversation::PULL;
@@ -452,6 +457,36 @@ class Processor
                return $item;
        }
 
+       /**
+        * Check if a given activity is no longer available
+        *
+        * @param string $url
+        *
+        * @return boolean
+        */
+       public static function isActivityGone(string $url): bool
+       {
+               $curlResult = HTTPSignature::fetchRaw($url, 0);
+
+               if (Network::isUrlBlocked($url)) {
+                       return true;
+               }
+
+               // @todo To ensure that the remote system is working correctly, we can check if the "Content-Type" contains JSON
+               if (in_array($curlResult->getReturnCode(), [404])) {
+                       return true;
+               }
+
+               $object = json_decode($curlResult->getBody(), true);
+               if (!empty($object)) {
+                       $activity = JsonLD::compact($object);
+                       if (JsonLD::fetchElement($activity, '@type') == 'as:Tombstone') {
+                               return true;
+                       }                       
+               }
+
+               return false;
+       }
        /**
         * Delete items
         *
@@ -551,16 +586,13 @@ class Processor
                        }
                }
 
-               if ($activity['target_id'] != $actor['featured']) {
-                       return null;
-               }
-
-               $id = Contact::getIdForURL($activity['actor']);
-               if (empty($id)) {
-                       return null;
+               $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id']]);
+               if (empty($parent['uri-id'])) {
+                       if (self::fetchMissingActivity($activity['object_id'], $activity, '', Receiver::COMPLETION_AUTO)) {
+                               $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id']]);
+                       }
                }
 
-               $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id'], 'author-id' => $id]);
                if (!empty($parent['uri-id'])) {
                        return $parent['uri-id'];
                }
@@ -936,6 +968,9 @@ class Processor
                                $success = true;
                        } else {
                                Logger::notice('Item insertion aborted', ['uri' => $item['uri'], 'uid' => $item['uid']]);
+                               if (Item::isTooOld($item) || !Item::isValid($item)) {
+                                       Queue::remove($activity);
+                               }
                        }
 
                        if ($item['uid'] == 0) {
@@ -945,7 +980,10 @@ class Processor
 
                if ($success) {
                        Queue::remove($activity);
-                       Queue::processReplyByUri($item['uri']);
+
+                       if (Queue::hasChildren($item['uri'])) {
+                               Worker::add(PRIORITY_HIGH, 'ProcessReplyByUri', $item['uri']);
+                       }
                }
 
                // Store send a follow request for every reshare - but only when the item had been stored
@@ -1191,20 +1229,27 @@ class Processor
                        return '';
                }
 
-               if (!empty($object['actor'])) {
-                       $object_actor = $object['actor'];
-               } elseif (!empty($object['attributedTo'])) {
-                       $object_actor = $object['attributedTo'];
-                       if (is_array($object_actor)) {
+               $signer = [];
+
+               if (!empty($object['attributedTo'])) {
+                       $attributed_to = $object['attributedTo'];
+                       if (is_array($attributed_to)) {
                                $compacted = JsonLD::compact($object);
-                               $object_actor = JsonLD::fetchElement($compacted, 'as:attributedTo', '@id');
+                               $attributed_to = JsonLD::fetchElement($compacted, 'as:attributedTo', '@id');
                        }
+                       $signer[] = $attributed_to;     
+               }
+
+               if (!empty($object['actor'])) {
+                       $object_actor = $object['actor'];
+               } elseif (!empty($attributed_to)) {
+                       $object_actor = $attributed_to;
                } else {
                        // Shouldn't happen
                        $object_actor = '';
                }
 
-               $signer = [$object_actor];
+               $signer[] = $object_actor;
 
                if (!empty($child['author'])) {
                        $actor = $child['author'];
@@ -1314,6 +1359,7 @@ class Processor
        {
                $uid = User::getIdForURL($activity['object_id']);
                if (empty($uid)) {
+                       Queue::remove($activity);
                        return;
                }