X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=427205958f846d5bfa7ac101d751a88fba0d39bf;hb=4097808b95dcdac41fd4146a560eb6f941891c94;hp=2649e9073788147ef6e7117d1982892b501fbf53;hpb=dc42dbb68a50fb2c60f439393eb6d1fe80b327cf;p=friendica.git diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index 2649e90737..427205958f 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -1,6 +1,6 @@ $url]); + break; + } + } + $recursion = 0; $x = debug_backtrace(); @@ -54,7 +96,7 @@ class JsonLD if ($recursion > 5) { Logger::error('jsonld bomb detected at: ' . $url); - exit(); + System::exit(); } $result = DI::cache()->get('documentLoader:' . $url); @@ -105,11 +147,12 @@ class JsonLD * Compacts a given JSON array * * @param array $json + * @param bool $logfailed * * @return array Compacted JSON array * @throws Exception */ - public static function compact($json) + public static function compact($json, bool $logfailed = true): array { jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader'); @@ -124,25 +167,37 @@ class JsonLD 'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id'], 'litepub' => (object)['@id' => 'http://litepub.social/ns#', '@type' => '@id'], 'sc' => (object)['@id' => 'http://schema.org#', '@type' => '@id'], - 'pt' => (object)['@id' => 'https://joinpeertube.org/ns#', '@type' => '@id']]; + 'pt' => (object)['@id' => 'https://joinpeertube.org/ns#', '@type' => '@id'], + 'mobilizon' => (object)['@id' => 'https://joinmobilizon.org/ns#', '@type' => '@id'], + 'fedibird' => (object)['@id' => 'http://fedibird.com/ns#', '@type' => '@id'], + 'misskey' => (object)['@id' => 'https://misskey-hub.net/ns#', '@type' => '@id'], + ]; + + $orig_json = $json; // Preparation for adding possibly missing content to the context if (!empty($json['@context']) && is_string($json['@context'])) { $json['@context'] = [$json['@context']]; } - // Workaround for servers with missing context - // See issue https://github.com/nextcloud/social/issues/330 if (!empty($json['@context']) && is_array($json['@context'])) { - $json['@context'][] = 'https://w3id.org/security/v1'; - } + // Remove empty entries from the context (a problem with WriteFreely) + $json['@context'] = array_filter($json['@context']); - // Trying to avoid memory problems with large content fields - if (!empty($json['object']['source']['content'])) { - $content = $json['object']['source']['content']; - $json['object']['source']['content'] = ''; + // Workaround for servers with missing context + // See issue https://github.com/nextcloud/social/issues/330 + if (!in_array('https://w3id.org/security/v1', $json['@context'])) { + $json['@context'][] = 'https://w3id.org/security/v1'; + } } + // Bookwyrm transmits "id" fields with "null", which isn't allowed. + array_walk_recursive($json, function (&$value, $key) { + if ($key == 'id' && is_null($value)) { + $value = ''; + } + }); + $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); try { @@ -150,15 +205,19 @@ class JsonLD } catch (Exception $e) { $compacted = false; - Logger::error('compacting error'); - // Sooner or later we should log some details as well - but currently this leads to memory issues - // Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG); + Logger::notice('compacting error', ['msg' => $e->getMessage(), 'previous' => $e->getPrevious(), 'line' => $e->getLine()]); + if ($logfailed && DI::config()->get('debug', 'ap_log_failure')) { + $tempfile = tempnam(System::getTempPath(), 'failed-jsonld'); + file_put_contents($tempfile, json_encode(['json' => $orig_json, 'callstack' => System::callstack(20), 'msg' => $e->getMessage(), 'previous' => $e->getPrevious()], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); + Logger::notice('Failed message stored', ['file' => $tempfile]); + } } $json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true); - if (isset($json['as:object']['as:source']['as:content']) && !empty($content)) { - $json['as:object']['as:source']['as:content'] = $content; + if ($json === false) { + Logger::notice('JSON encode->decode failed', ['orig_json' => $orig_json, 'compacted' => $compacted]); + $json = []; } return $json; @@ -173,24 +232,28 @@ class JsonLD * * @return array fetched element */ - public static function fetchElementArray($array, $element, $key = null) + public static function fetchElementArray($array, $element, $key = null, $type = null, $type_value = null) { if (!isset($array[$element])) { return null; } // If it isn't an array yet, make it to one - if (!is_int(key($array[$element]))) { + if (!is_array($array[$element]) || !is_int(key($array[$element]))) { $array[$element] = [$array[$element]]; } $elements = []; foreach ($array[$element] as $entry) { - if (!is_array($entry) || (is_null($key) && is_array($entry))) { - $elements[] = $entry; - } elseif (!is_null($key) && isset($entry[$key])) { - $elements[] = $entry[$key]; + if (!is_array($entry) || is_null($key)) { + $item = $entry; + } elseif (isset($entry[$key])) { + $item = $entry[$key]; + } + + if (isset($item) && (is_null($type) || is_null($type_value) || isset($item[$type]) && $item[$type] == $type_value)) { + $elements[] = $item; } }