Collect data about used protocols for delivery

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

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 97bd7dc7e76a05007c6c9c8103138aa816314bb9..1d425600d81b76ded4dda6f4819c1690e60e2751 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -194,6 +194,11 @@ class Receiver
                        return [];
                }
 
+               if (!is_string($object_id)) {
+                       Logger::info('Invalid object id', ['object' => $object_id]);
+                       return [];
+               }
+
                $object_type = self::fetchObjectType($activity, $object_id, $uid);
 
                // Fetch the content only on activities where this matters
@@ -217,8 +222,7 @@ class Receiver
 
                        // We had been able to retrieve the object data - so we can trust the source
                        $trust_source = true;
-               } elseif (in_array($type, ['as:Like', 'as:Dislike']) ||
-                       (($type == 'as:Follow') && in_array($object_type, self::CONTENT_TYPES))) {
+               } elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Follow'])) && in_array($object_type, self::CONTENT_TYPES)) {
                        // Create a mostly empty array out of the activity data (instead of the object).
                        // This way we later don't have to check for the existence of ech individual array element.
                        $object_data = self::processObject($activity);
@@ -736,11 +740,11 @@ class Receiver
         * @param boolean $trust_source Do we trust the provided object?
         * @param integer $uid          User ID for the signature that we use to fetch data
         *
-        * @return array with trusted and valid object data
+        * @return array|false with trusted and valid object data
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function fetchObject($object_id, $object = [], $trust_source = false, $uid = 0)
+       private static function fetchObject(string $object_id, array $object = [], bool $trust_source = false, int $uid = 0)
        {
                // By fetching the type we check if the object is complete.
                $type = JsonLD::fetchElement($object, '@type');
@@ -779,13 +783,14 @@ class Receiver
 
                if ($type == 'as:Announce') {
                        $object_id = JsonLD::fetchElement($object, 'object', '@id');
-                       if (empty($object_id)) {
+                       if (empty($object_id) || !is_string($object_id)) {
                                return false;
                        }
                        return self::fetchObject($object_id, [], false, $uid);
                }
 
                Logger::log('Unhandled object type: ' . $type, Logger::DEBUG);
+               return false;
        }
 
        /**