bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10256 from annando/fix-ap

Browse source 
Quickfix for current Json-LD problems
This commit is contained in:
Hypolite Petovan 2021-05-16 11:06:47 -04:00 committed by GitHub
commit a4a2f4616c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/Util/JsonLD.php
View file

@ -67,6 +67,40 @@ class JsonLD
return $data; return $data;
} }
public static function fixContext(array $json)
{
// Preparation for adding possibly missing content to the context
if (!empty($json['@context']) && is_string($json['@context'])) {
$json['@context'] = [$json['@context']];
}
if (($key = array_search('https://w3id.org/security/v1', $json['@context'])) !== false) {
unset($json['@context'][$key]);
$json['@context'] = array_values(array_filter($json['@context']));
}
$last_entry = count($json['@context']) - 1;
$additional = [
'w3id' => 'https://w3id.org/security#',
'signature' => 'w3id:signature',
'RsaSignature2017' => 'w3id:RsaSignature2017',
'created' => 'w3id:created',
'creator' => 'w3id:creator',
'nonce' => 'w3id:nonce',
'signatureValue' => 'w3id:signatureValue',
'publicKey' => 'w3id:publicKey',
'publicKeyPem' => 'w3id:publicKeyPem'];
if (is_array($json['@context'][$last_entry])) {
$json['@context'][$last_entry] = array_merge($json['@context'][$last_entry], $additional);
} else {
$json['@context'][] = $additional;
}
return $json;
}
/** /**
* Normalises a given JSON array * Normalises a given JSON array
* *
@ -77,6 +111,8 @@ class JsonLD
*/ */
public static function normalize($json) public static function normalize($json)
{ {
$json = self::fixContext($json);
jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader'); jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
@ -111,10 +147,12 @@ class JsonLD
*/ */
public static function compact($json) public static function compact($json)
{ {
$json = self::fixContext($json);
jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader'); jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
$context = (object)['as' => 'https://www.w3.org/ns/activitystreams#', $context = (object)['as' => 'https://www.w3.org/ns/activitystreams#',
'w3id' => 'https://w3id.org/security#', 'w3id' => (object)['@id' => 'https://w3id.org/security#', '@type' => '@id'],
'ldp' => (object)['@id' => 'http://www.w3.org/ns/ldp#', '@type' => '@id'], 'ldp' => (object)['@id' => 'http://www.w3.org/ns/ldp#', '@type' => '@id'],
'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'], 'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
'dfrn' => (object)['@id' => 'http://purl.org/macgirvin/dfrn/1.0/', '@type' => '@id'], 'dfrn' => (object)['@id' => 'http://purl.org/macgirvin/dfrn/1.0/', '@type' => '@id'],
@ -126,17 +164,6 @@ class JsonLD
'sc' => (object)['@id' => 'http://schema.org#', '@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']];
// 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';
}
// Trying to avoid memory problems with large content fields // Trying to avoid memory problems with large content fields
if (!empty($json['object']['source']['content'])) { if (!empty($json['object']['source']['content'])) {
$content = $json['object']['source']['content']; $content = $json['object']['source']['content'];