Update ActivityPubFetchService, enforce stricter Content-Type validation

This commit is contained in:
Daniel Supernault 2024-02-15 21:22:41 -07:00
parent 4c6ec20e36
commit 1232cfc86a
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1

View file

@ -28,7 +28,8 @@ class ActivityPubFetchService
$headers['User-Agent'] = 'PixelFedBot/1.0.0 (Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')'; $headers['User-Agent'] = 'PixelFedBot/1.0.0 (Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')';
try { try {
$res = Http::withOptions(['allow_redirects' => false])->withHeaders($headers) $res = Http::withOptions(['allow_redirects' => false])
->withHeaders($headers)
->timeout(30) ->timeout(30)
->connectTimeout(5) ->connectTimeout(5)
->retry(3, 500) ->retry(3, 500)
@ -40,9 +41,31 @@ class ActivityPubFetchService
} catch (Exception $e) { } catch (Exception $e) {
return; return;
} }
if(!$res->ok()) { if(!$res->ok()) {
return; return;
} }
if(!$res->hasHeader('Content-Type')) {
return;
}
$acceptedTypes = [
'application/activity+json; charset=utf-8',
'application/activity+json',
'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
];
$contentType = $res->getHeader('Content-Type')[0];
if(!$contentType) {
return;
}
if(!in_array($contentType, $acceptedTypes)) {
return;
}
return $res->body(); return $res->body();
} }
} }