chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update InboxPipeline, fixes #3306

This commit is contained in:
Daniel Supernault 2022-03-12 23:49:11 -07:00
parent 72918a4b09
commit 20710f4d6e
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/InboxPipeline/InboxValidator.php
View File

@ -223,6 +223,9 @@ class InboxValidator implements ShouldQueue
'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org', 'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
])->get($actor->remote_url); ])->get($actor->remote_url);
$res = json_decode($res->body(), true, 8); $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) { if($res['publicKey']['id'] !== $actor->key_id) {
return; return;
} }

3
app/Jobs/InboxPipeline/InboxWorker.php
View File

@ -211,6 +211,9 @@ class InboxWorker implements ShouldQueue
'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org', 'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
])->get($actor->remote_url); ])->get($actor->remote_url);
$res = json_decode($res->body(), true, 8); $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) { if($res['publicKey']['id'] !== $actor->key_id) {
return; return;
} }