From 18b00b8ca1d140f19d7fc20d1d1a252e7bceb07d Mon Sep 17 00:00:00 2001 From: Melroy van den Berg Date: Fri, 17 Jan 2025 23:51:29 +0100 Subject: [PATCH] Do not dump the whole HTML page in the production log --- src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php b/src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php index 3ca978e38..bb12637b3 100644 --- a/src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php +++ b/src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php @@ -67,8 +67,10 @@ public function doWork(MessageInterface $message): void $payload = @json_decode($message->payload, true); if (null === $payload) { - $this->logger->warning('[ActivityHandler::doWork] Activity message from was empty: {json}, ignoring it', ['json' => json_encode($message->payload)]); - throw new UnrecoverableMessageHandlingException('activity message from was empty'); + $this->logger->warning('[ActivityHandler::doWork] Activity message from was empty or invalid JSON. Truncated content: {content}, ignoring it', [ + 'content' => substr($message->payload ?? 'No payload provided', 0, 200), + ]); + throw new UnrecoverableMessageHandlingException('Activity message from was empty or invalid JSON'); } if ($message->request && $message->headers) { @@ -93,7 +95,7 @@ public function doWork(MessageInterface $message): void if (null === $payload['id']) { $this->logger->warning('[ActivityHandler::doWork] Activity message has no id field which is required: {json}', ['json' => json_encode($message->payload)]); - throw new UnrecoverableMessageHandlingException('activity message has no id field'); + throw new UnrecoverableMessageHandlingException('Activity message has no id field'); } $idHost = parse_url($payload['id'], PHP_URL_HOST);