Update InboxPipeline, fixes #3306

3 years ago · 20710f4d6e
parent 72918a4b09
commit 20710f4d6e
2 changed files with 6 additions and 0 deletions
--- a/app/Jobs/InboxPipeline/InboxValidator.php
+++ b/app/Jobs/InboxPipeline/InboxValidator.php
@ -223,6 +223,9 @@ class InboxValidator implements ShouldQueue
          'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
        ])->get($actor->remote_url);
        $res = json_decode($res->body(), true, 8);
+        if(!$res || empty($res) || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
+        	return;
+        }
        if($res['publicKey']['id'] !== $actor->key_id) {
            return;
        }
--- a/app/Jobs/InboxPipeline/InboxWorker.php
+++ b/app/Jobs/InboxPipeline/InboxWorker.php
@ -211,6 +211,9 @@ class InboxWorker implements ShouldQueue
          'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
        ])->get($actor->remote_url);
        $res = json_decode($res->body(), true, 8);
+        if(!$res || empty($res) || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
+        	return;
+        }
        if($res['publicKey']['id'] !== $actor->key_id) {
            return;
        }