From d821afb418b0705353e6498fe5c4cc966a0fcba9 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 28 Sep 2022 16:32:17 +0000 Subject: [PATCH 1/2] Added logging of unexpected follow messages --- src/Protocol/ActivityPub/Receiver.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 0cdbe82fc7..57f1089a36 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -852,7 +852,11 @@ class Receiver case 'as:Accept': if ($object_data['object_type'] == 'as:Follow') { - ActivityPub\Processor::acceptFollowUser($object_data); + if (!empty($object_data['object_actor'])) { + ActivityPub\Processor::acceptFollowUser($object_data); + } else { + Logger::debug('Unhandled "accept follow" message.', ['object_data' => $object_data]); + } } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) { ActivityPub\Processor::createActivity($object_data, Activity::ATTEND); } else { From b10496f4e97eadfe7aca9e0abf3ac951d3715185 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 28 Sep 2022 16:45:18 +0000 Subject: [PATCH 2/2] Changed log level --- src/Protocol/ActivityPub/Receiver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 57f1089a36..c161ce4d11 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -855,7 +855,7 @@ class Receiver if (!empty($object_data['object_actor'])) { ActivityPub\Processor::acceptFollowUser($object_data); } else { - Logger::debug('Unhandled "accept follow" message.', ['object_data' => $object_data]); + Logger::notice('Unhandled "accept follow" message.', ['object_data' => $object_data]); } } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) { ActivityPub\Processor::createActivity($object_data, Activity::ATTEND);