Handle changed parents

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 9c7cfef77d815351b16211befb9cebef56b0a264..d1c3994e2aee306d275ff94435d80866f8a714e1 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;
 
@@ -282,7 +284,7 @@ class Processor
 
                if (!empty($activity['context'])) {
                        $item['conversation'] = $activity['context'];
-               } elseif(!empty($activity['conversation'])) {
+               } elseif (!empty($activity['conversation'])) {
                        $item['conversation'] = $activity['conversation'];
                }
 
@@ -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::ActivityIsGone($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]);
@@ -452,6 +459,24 @@ class Processor
                return $item;
        }
 
+       /**
+        * Check if a given activity is no longer available
+        *
+        * @param string $url
+        *
+        * @return boolean
+        */
+       private static function ActivityIsGone(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
+               return in_array($curlResult->getReturnCode(), [404]);
+       }
        /**
         * Delete items
         *
@@ -551,16 +576,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'];
                }
@@ -695,7 +717,7 @@ class Processor
                                        Logger::warning('Unknown parent item.', ['uri' => $parent_uri]);
                                        return false;
                                }
-                               if (($parent['private'] == Item::PRIVATE) && ($parent['private'] != Item::PRIVATE)) {
+                               if (($item['private'] == Item::PRIVATE) && ($parent['private'] != Item::PRIVATE)) {
                                        Logger::warning('Item is private but the parent is not. Dropping.', ['item-uri' => $item['uri'], 'thr-parent' => $item['thr-parent']]);
                                        return false;
                                }
@@ -935,7 +957,10 @@ class Processor
                                Logger::info('Item insertion successful', ['user' => $item['uid'], 'item_id' => $item_id]);
                                $success = true;
                        } else {
-                               Logger::notice('Item insertion aborted', ['user' => $item['uid']]);
+                               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) {
@@ -1191,20 +1216,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'];