Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 19:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Centralized logging for a wrong JSON content-type

Browse source
This commit is contained in:
Michael 2024-03-08 13:48:21 +00:00
parent 013bba50bc
commit d9bedbb473
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Model/APContact.php
View file

@ -208,8 +208,7 @@ class APContact
if (!$failed && ($curlResult->getReturnCode() == 410)) {
$data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone'];
} elseif (!$failed && !HTTPSignature::isValidContentType($curlResult->getContentType())) {
Logger::debug('Unexpected content type', ['content-type' => $curlResult->getContentType(), 'url' => $url]);
} elseif (!$failed && !HTTPSignature::isValidContentType($curlResult->getContentType(), $url)) {
$failed = true;
}
} catch (\Exception $exception) {

2
src/Model/Item.php
View file

@ -4097,7 +4097,7 @@ class Item
}
$curlResult = DI::httpClient()->head($uri, [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::JSON_AS]);
if (HTTPSignature::isValidContentType($curlResult->getContentType())) {
if (HTTPSignature::isValidContentType($curlResult->getContentType(), $uri)) {
$fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri, [], '', $completion, $uid);
}