bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion

Browse source
This commit is contained in:
Hypolite Petovan 2019-06-13 19:07:39 -04:00
parent af9ce6b92a
commit 66d4f1d40b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Protocol/ActivityPub/Receiver.php
View file

@ -736,11 +736,11 @@ class Receiver
* @param boolean $trust_source Do we trust the provided object? * @param boolean $trust_source Do we trust the provided object?
* @param integer $uid User ID for the signature that we use to fetch data * @param integer $uid User ID for the signature that we use to fetch data
* *
* @return array with trusted and valid object data * @return array|false with trusted and valid object data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
private static function fetchObject($object_id, $object = [], $trust_source = false, $uid = 0) private static function fetchObject(string $object_id, array $object = [], bool $trust_source = false, int $uid = 0)
{ {
// By fetching the type we check if the object is complete. // By fetching the type we check if the object is complete.
$type = JsonLD::fetchElement($object, '@type'); $type = JsonLD::fetchElement($object, '@type');
@ -786,6 +786,7 @@ class Receiver
} }
Logger::log('Unhandled object type: ' . $type, Logger::DEBUG); Logger::log('Unhandled object type: ' . $type, Logger::DEBUG);
return false;
} }
/** /**