clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13976 from annando/content-type-logging 

Centralized logging for a wrong JSON content-type
This commit is contained in:
Hypolite Petovan 2024-03-08 11:03:03 -05:00 committed by GitHub
parent 013bba50bc d9bedbb473
commit f041701765
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 9 deletions
Show Stats 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)) { if (!$failed && ($curlResult->getReturnCode() == 410)) {
$data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone']; $data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone'];
} elseif (!$failed && !HTTPSignature::isValidContentType($curlResult->getContentType())) { } elseif (!$failed && !HTTPSignature::isValidContentType($curlResult->getContentType(), $url)) {
Logger::debug('Unexpected content type', ['content-type' => $curlResult->getContentType(), 'url' => $url]);
$failed = true; $failed = true;
} }
} catch (\Exception $exception) { } 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]); $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); $fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri, [], '', $completion, $uid);
} }

3
src/Protocol/ActivityPub/Processor.php
View File

@ -1618,8 +1618,7 @@ class Processor
return ''; return '';
} }
if (!HTTPSignature::isValidContentType($curlResult->getContentType())) { if (!HTTPSignature::isValidContentType($curlResult->getContentType(), $url)) {
Logger::notice('Unexpected content type', ['content-type' => $curlResult->getContentType(), 'url' => $url]);
return ''; return '';
} }

14
src/Util/HTTPSignature.php
View File

@ -443,8 +443,7 @@ class HTTPSignature
return []; return [];
} }
if (!self::isValidContentType($curlResult->getContentType())) { if (!self::isValidContentType($curlResult->getContentType(), $request)) {
Logger::notice('Unexpected content type', ['content-type' => $curlResult->getContentType(), 'url' => $request]);
return []; return [];
} }
@ -457,9 +456,16 @@ class HTTPSignature
* @param string $contentType * @param string $contentType
* @return boolean * @return boolean
*/ */
public static function isValidContentType(string $contentType): bool public static function isValidContentType(string $contentType, string $url = ''): bool
{ {
return in_array(current(explode(';', $contentType)), ['application/activity+json', 'application/ld+json']); if (in_array(current(explode(';', $contentType)), ['application/activity+json', 'application/ld+json'])) {
return true;
}
if (current(explode(';', $contentType)) == 'application/json') {
Logger::notice('Unexpected content type, possibly from a remote system that is not standard compliant.', ['content-type' => $contentType, 'url' => $url]);
}
return false;
} }
/** /**