friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #5854 from annando/ap-parser 

We now parse a compacted JSON
This commit is contained in:
Hypolite Petovan 2018-10-07 17:42:03 -04:00 committed by GitHub
parent ebe87bb16d 30ad6d60fd
commit 28b4fdb1c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 407 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
database.sql
View File

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2018.12-dev (The Tazmans Flax-lily) -- Friendica 2018.12-dev (The Tazmans Flax-lily)
-- DB_UPDATE_VERSION 1283 -- DB_UPDATE_VERSION 1284
-- ------------------------------------------ -- ------------------------------------------
@ -19,6 +19,32 @@ CREATE TABLE IF NOT EXISTS `addon` (
UNIQUE INDEX `name` (`name`) UNIQUE INDEX `name` (`name`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registered addons'; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registered addons';
--
-- TABLE apcontact
--
CREATE TABLE IF NOT EXISTS `apcontact` (
`url` varbinary(255) NOT NULL COMMENT 'URL of the contact',
`uuid` varchar(255) COMMENT '',
`type` varchar(20) NOT NULL COMMENT '',
`following` varchar(255) COMMENT '',
`followers` varchar(255) COMMENT '',
`inbox` varchar(255) NOT NULL COMMENT '',
`outbox` varchar(255) COMMENT '',
`sharedinbox` varchar(255) COMMENT '',
`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`name` varchar(255) COMMENT '',
`about` text COMMENT '',
`photo` varchar(255) COMMENT '',
`addr` varchar(255) COMMENT '',
`alias` varchar(255) COMMENT '',
`pubkey` text COMMENT '',
`baseurl` varchar(255) COMMENT 'baseurl of the ap contact',
`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
PRIMARY KEY(`url`),
INDEX `addr` (`addr`(32)),
INDEX `url` (`followers`(190))
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='ActivityPub compatible contacts - used in the ActivityPub implementation';
-- --
-- TABLE attach -- TABLE attach
-- --
@ -212,7 +238,7 @@ CREATE TABLE IF NOT EXISTS `conversation` (
`reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'URI to which this item is a reply', `reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'URI to which this item is a reply',
`conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation URI', `conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation URI',
`conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation link', `conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation link',
`protocol` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The protocol of the item', `protocol` tinyint unsigned NOT NULL DEFAULT 255 COMMENT 'The protocol of the item',
`source` mediumtext COMMENT 'Original source', `source` mediumtext COMMENT 'Original source',
`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Receiving date', `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Receiving date',
PRIMARY KEY(`item-uri`), PRIMARY KEY(`item-uri`),

5
src/Protocol/ActivityPub.php
View File

@ -39,8 +39,6 @@ class ActivityPub
'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']]; 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application']; const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image'];
const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'];
/** /**
* Checks if the web request is done for the AP protocol * Checks if the web request is done for the AP protocol
* *
@ -134,7 +132,8 @@ class ActivityPub
} }
foreach ($items as $activity) { foreach ($items as $activity) {
ActivityPub\Receiver::processActivity($activity, '', $uid, true); $ldactivity = JsonLD::compact($activity);
ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
} }
} }
} }

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

@ -52,7 +52,7 @@ class Processor
$tag_text = ''; $tag_text = '';
foreach ($tags as $tag) { foreach ($tags as $tag) {
if (in_array($tag['type'], ['Mention', 'Hashtag'])) { if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag'])) {
if (!empty($tag_text)) { if (!empty($tag_text)) {
$tag_text .= ','; $tag_text .= ',';
} }
@ -67,9 +67,9 @@ class Processor
} }
/** /**
* * Add attachment data to the item array
* *
* @param $attachments * @param array $attachments
* @param array $item * @param array $item
* *
* @return item array * @return item array
@ -101,10 +101,10 @@ class Processor
} }
/** /**
* * Prepares data for a message
* *
* @param array $activity * @param array $activity Activity array
* @param $body * @param string $body original source
*/ */
public static function createItem($activity, $body) public static function createItem($activity, $body)
{ {
@ -129,16 +129,16 @@ class Processor
} }
/** /**
* * Prepare the item array for a "like"
* *
* @param array $activity * @param array $activity Activity array
* @param $body * @param string $body original source
*/ */
public static function likeItem($activity, $body) public static function likeItem($activity, $body)
{ {
$item = []; $item = [];
$item['verb'] = ACTIVITY_LIKE; $item['verb'] = ACTIVITY_LIKE;
$item['parent-uri'] = $activity['object']; $item['parent-uri'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY; $item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE; $item['object-type'] = ACTIVITY_OBJ_NOTE;
@ -149,27 +149,26 @@ class Processor
* Delete items * Delete items
* *
* @param array $activity * @param array $activity
* @param $body
*/ */
public static function deleteItem($activity) public static function deleteItem($activity)
{ {
$owner = Contact::getIdForURL($activity['owner']); $owner = Contact::getIdForURL($activity['actor']);
$object = JsonLD::fetchElement($activity, 'object', 'id');
logger('Deleting item ' . $object . ' from ' . $owner, LOGGER_DEBUG); logger('Deleting item ' . $activity['object_id'] . ' from ' . $owner, LOGGER_DEBUG);
Item::delete(['uri' => $object, 'owner-id' => $owner]); Item::delete(['uri' => $activity['object_id'], 'owner-id' => $owner]);
} }
/** /**
* * Prepare the item array for a "dislike"
* *
* @param array $activity * @param array $activity Activity array
* @param $body * @param string $body original source
*/ */
public static function dislikeItem($activity, $body) public static function dislikeItem($activity, $body)
{ {
$item = []; $item = [];
$item['verb'] = ACTIVITY_DISLIKE; $item['verb'] = ACTIVITY_DISLIKE;
$item['parent-uri'] = $activity['object']; $item['parent-uri'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY; $item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE; $item['object-type'] = ACTIVITY_OBJ_NOTE;
@ -177,11 +176,11 @@ class Processor
} }
/** /**
* * Creates an item post
* *
* @param array $activity * @param array $activity Activity data
* @param array $item * @param array $item item array
* @param $body * @param string $body original source
*/ */
private static function postItem($activity, $item, $body) private static function postItem($activity, $item, $body)
{ {
@ -195,7 +194,7 @@ class Processor
$item['network'] = Protocol::ACTIVITYPUB; $item['network'] = Protocol::ACTIVITYPUB;
$item['private'] = !in_array(0, $activity['receiver']); $item['private'] = !in_array(0, $activity['receiver']);
$item['author-id'] = Contact::getIdForURL($activity['author'], 0, true); $item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
$item['owner-id'] = Contact::getIdForURL($activity['owner'], 0, true); $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
$item['uri'] = $activity['id']; $item['uri'] = $activity['id'];
$item['created'] = $activity['published']; $item['created'] = $activity['published'];
$item['edited'] = $activity['updated']; $item['edited'] = $activity['updated'];
@ -210,9 +209,8 @@ class Processor
$item = self::constructAttachList($activity['attachments'], $item); $item = self::constructAttachList($activity['attachments'], $item);
$source = JsonLD::fetchElement($activity, 'source', 'content', 'mediaType', 'text/bbcode'); if (!empty($activity['source'])) {
if (!empty($source)) { $item['body'] = $activity['source'];
$item['body'] = $source;
} }
$item['protocol'] = Conversation::PARCEL_ACTIVITYPUB; $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
@ -234,7 +232,7 @@ class Processor
} }
/** /**
* * Fetches missing posts
* *
* @param $url * @param $url
* @param $child * @param $child
@ -262,7 +260,8 @@ class Processor
$activity['published'] = $object['published']; $activity['published'] = $object['published'];
$activity['type'] = 'Create'; $activity['type'] = 'Create';
ActivityPub\Receiver::processActivity($activity); $ldactivity = JsonLD::compact($activity);
ActivityPub\Receiver::processActivity($ldactivity);
logger('Activity ' . $url . ' had been fetched and processed.'); logger('Activity ' . $url . ' had been fetched and processed.');
} }
@ -273,26 +272,25 @@ class Processor
*/ */
public static function followUser($activity) public static function followUser($activity)
{ {
$actor = JsonLD::fetchElement($activity, 'object', 'id'); $uid = User::getIdForURL($activity['object_id']);
$uid = User::getIdForURL($actor);
if (empty($uid)) { if (empty($uid)) {
return; return;
} }
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
$cid = Contact::getIdForURL($activity['owner'], $uid); $cid = Contact::getIdForURL($activity['actor'], $uid);
if (!empty($cid)) { if (!empty($cid)) {
$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]); $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
} else { } else {
$contact = false; $contact = false;
} }
$item = ['author-id' => Contact::getIdForURL($activity['owner']), $item = ['author-id' => Contact::getIdForURL($activity['actor']),
'author-link' => $activity['owner']]; 'author-link' => $activity['actor']];
Contact::addRelationship($owner, $contact, $item); Contact::addRelationship($owner, $contact, $item);
$cid = Contact::getIdForURL($activity['owner'], $uid); $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) { if (empty($cid)) {
return; return;
} }
@ -313,12 +311,12 @@ class Processor
*/ */
public static function updatePerson($activity) public static function updatePerson($activity)
{ {
if (empty($activity['object']['id'])) { if (empty($activity['object_id'])) {
return; return;
} }
logger('Updating profile for ' . $activity['object']['id'], LOGGER_DEBUG); logger('Updating profile for ' . $activity['object_id'], LOGGER_DEBUG);
APContact::getByURL($activity['object']['id'], true); APContact::getByURL($activity['object_id'], true);
} }
/** /**
@ -328,23 +326,23 @@ class Processor
*/ */
public static function deletePerson($activity) public static function deletePerson($activity)
{ {
if (empty($activity['object']['id']) || empty($activity['object']['actor'])) { if (empty($activity['object_id']) || empty($activity['actor'])) {
logger('Empty object id or actor.', LOGGER_DEBUG); logger('Empty object id or actor.', LOGGER_DEBUG);
return; return;
} }
if ($activity['object']['id'] != $activity['object']['actor']) { if ($activity['object_id'] != $activity['actor']) {
logger('Object id does not match actor.', LOGGER_DEBUG); logger('Object id does not match actor.', LOGGER_DEBUG);
return; return;
} }
$contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object']['id'])]); $contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object_id'])]);
while ($contact = DBA::fetch($contacts)) { while ($contact = DBA::fetch($contacts)) {
Contact::remove($contact["id"]); Contact::remove($contact['id']);
} }
DBA::close($contacts); DBA::close($contacts);
logger('Deleted contact ' . $activity['object']['id'], LOGGER_DEBUG); logger('Deleted contact ' . $activity['object_id'], LOGGER_DEBUG);
} }
/** /**
@ -354,17 +352,16 @@ class Processor
*/ */
public static function acceptFollowUser($activity) public static function acceptFollowUser($activity)
{ {
$actor = JsonLD::fetchElement($activity, 'object', 'actor'); $uid = User::getIdForURL($activity['object_actor']);
$uid = User::getIdForURL($actor);
if (empty($uid)) { if (empty($uid)) {
return; return;
} }
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
$cid = Contact::getIdForURL($activity['owner'], $uid); $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) { if (empty($cid)) {
logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG); logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return; return;
} }
@ -387,17 +384,16 @@ class Processor
*/ */
public static function rejectFollowUser($activity) public static function rejectFollowUser($activity)
{ {
$actor = JsonLD::fetchElement($activity, 'object', 'actor'); $uid = User::getIdForURL($activity['object_actor']);
$uid = User::getIdForURL($actor);
if (empty($uid)) { if (empty($uid)) {
return; return;
} }
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
$cid = Contact::getIdForURL($activity['owner'], $uid); $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) { if (empty($cid)) {
logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG); logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return; return;
} }
@ -416,22 +412,20 @@ class Processor
*/ */
public static function undoActivity($activity) public static function undoActivity($activity)
{ {
$activity_url = JsonLD::fetchElement($activity, 'object', 'id'); if (empty($activity['object_id'])) {
if (empty($activity_url)) {
return; return;
} }
$actor = JsonLD::fetchElement($activity, 'object', 'actor'); if (empty($activity['object_actor'])) {
if (empty($actor)) {
return; return;
} }
$author_id = Contact::getIdForURL($actor); $author_id = Contact::getIdForURL($activity['object_actor']);
if (empty($author_id)) { if (empty($author_id)) {
return; return;
} }
Item::delete(['uri' => $activity_url, 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]); Item::delete(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
} }
/** /**
@ -441,17 +435,16 @@ class Processor
*/ */
public static function undoFollowUser($activity) public static function undoFollowUser($activity)
{ {
$object = JsonLD::fetchElement($activity, 'object', 'object'); $uid = User::getIdForURL($activity['object_object']);
$uid = User::getIdForURL($object);
if (empty($uid)) { if (empty($uid)) {
return; return;
} }
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
$cid = Contact::getIdForURL($activity['owner'], $uid); $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) { if (empty($cid)) {
logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG); logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return; return;
} }

381
src/Protocol/ActivityPub/Receiver.php
View File

@ -30,12 +30,14 @@ use Friendica\Protocol\ActivityPub;
* - Remove * - Remove
* - Undo Block * - Undo Block
* - Undo Accept (Problem: This could invert a contact accept or an event accept) * - Undo Accept (Problem: This could invert a contact accept or an event accept)
*
* General:
* - Possibly using the LD-JSON parser
*/ */
class Receiver class Receiver
{ {
const PUBLIC_COLLECTION = 'as:Public';
const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application'];
const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image'];
const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept'];
/** /**
* Checks if the web request is done for the AP protocol * Checks if the web request is done for the AP protocol
* *
@ -48,7 +50,7 @@ class Receiver
} }
/** /**
* * Checks incoming message from the inbox
* *
* @param $body * @param $body
* @param $header * @param $header
@ -66,14 +68,17 @@ class Receiver
$activity = json_decode($body, true); $activity = json_decode($body, true);
$actor = JsonLD::fetchElement($activity, 'actor', 'id');
logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
if (empty($activity)) { if (empty($activity)) {
logger('Invalid body.', LOGGER_DEBUG); logger('Invalid body.', LOGGER_DEBUG);
return; return;
} }
$ldactivity = JsonLD::compact($activity);
$actor = JsonLD::fetchElement($ldactivity, 'as:actor');
logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
if (LDSignature::isSigned($activity)) { if (LDSignature::isSigned($activity)) {
$ld_signer = LDSignature::getSigner($activity); $ld_signer = LDSignature::getSigner($activity);
if (empty($ld_signer)) { if (empty($ld_signer)) {
@ -100,26 +105,66 @@ class Receiver
$trust_source = false; $trust_source = false;
} }
self::processActivity($activity, $body, $uid, $trust_source); self::processActivity($ldactivity, $body, $uid, $trust_source);
} }
/** /**
* * Fetches the object type for a given object id
*
* @param array $activity
* @param string $object_id Object ID of the the provided object
*
* @return string with object type
*/
private static function fetchObjectType($activity, $object_id)
{
$object_type = JsonLD::fetchElement($activity['as:object'], '@type');
if (!empty($object_type)) {
return $object_type;
}
if (Item::exists(['uri' => $object_id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]])) {
// We just assume "note" since it doesn't make a difference for the further processing
return 'as:Note';
}
$profile = APContact::getByURL($object_id);
if (!empty($profile['type'])) {
return 'as:' . $profile['type'];
}
$data = ActivityPub::fetchContent($object_id);
if (!empty($data)) {
$object = JsonLD::compact($data);
$type = JsonLD::fetchElement($object, '@type');
if (!empty($type)) {
return $type;
}
}
return null;
}
/**
* Prepare the object array
* *
* @param array $activity * @param array $activity
* @param integer $uid User ID * @param integer $uid User ID
* @param $trust_source * @param $trust_source
* *
* @return * @return array with object data
*/ */
private static function prepareObjectData($activity, $uid, &$trust_source) private static function prepareObjectData($activity, $uid, &$trust_source)
{ {
$actor = JsonLD::fetchElement($activity, 'actor', 'id'); $actor = JsonLD::fetchElement($activity, 'as:actor');
if (empty($actor)) { if (empty($actor)) {
logger('Empty actor', LOGGER_DEBUG); logger('Empty actor', LOGGER_DEBUG);
return []; return [];
} }
$type = JsonLD::fetchElement($activity, '@type');
// Fetch all receivers from to, cc, bto and bcc // Fetch all receivers from to, cc, bto and bcc
$receivers = self::getReceivers($activity, $actor); $receivers = self::getReceivers($activity, $actor);
@ -132,40 +177,51 @@ class Receiver
logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG); logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
$object_id = JsonLD::fetchElement($activity, 'object', 'id'); $object_id = JsonLD::fetchElement($activity, 'as:object');
if (empty($object_id)) { if (empty($object_id)) {
logger('No object found', LOGGER_DEBUG); logger('No object found', LOGGER_DEBUG);
return []; return [];
} }
$object_type = self::fetchObjectType($activity, $object_id);
// Fetch the content only on activities where this matters // Fetch the content only on activities where this matters
if (in_array($activity['type'], ['Create', 'Announce'])) { if (in_array($type, ['as:Create', 'as:Announce'])) {
$object_data = self::fetchObject($object_id, $activity['object'], $trust_source); if ($type == 'as:Announce') {
$trust_source = false;
}
$object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source);
if (empty($object_data)) { if (empty($object_data)) {
logger("Object data couldn't be processed", LOGGER_DEBUG); logger("Object data couldn't be processed", LOGGER_DEBUG);
return []; return [];
} }
// We had been able to retrieve the object data - so we can trust the source // We had been able to retrieve the object data - so we can trust the source
$trust_source = true; $trust_source = true;
} elseif (in_array($activity['type'], ['Like', 'Dislike'])) { } elseif (in_array($type, ['as:Like', 'as:Dislike'])) {
// Create a mostly empty array out of the activity data (instead of the object). // Create a mostly empty array out of the activity data (instead of the object).
// This way we later don't have to check for the existence of ech individual array element. // This way we later don't have to check for the existence of ech individual array element.
$object_data = self::processObject($activity); $object_data = self::processObject($activity);
$object_data['name'] = $activity['type']; $object_data['name'] = $type;
$object_data['author'] = $activity['actor']; $object_data['author'] = JsonLD::fetchElement($activity, 'as:actor');
$object_data['object'] = $object_id; $object_data['object_id'] = $object_id;
$object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type $object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
} else { } else {
$object_data = []; $object_data = [];
$object_data['id'] = $activity['id']; $object_data['id'] = JsonLD::fetchElement($activity, '@id');
$object_data['object'] = $activity['object']; $object_data['object_id'] = JsonLD::fetchElement($activity, 'as:object');
$object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type'); $object_data['object_actor'] = JsonLD::fetchElement($activity['as:object'], 'as:actor');
$object_data['object_object'] = JsonLD::fetchElement($activity['as:object'], 'as:object');
$object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type');
} }
$object_data = self::addActivityFields($object_data, $activity); $object_data = self::addActivityFields($object_data, $activity);
$object_data['type'] = $activity['type']; if (empty($object_data['object_type'])) {
$object_data['owner'] = $actor; $object_data['object_type'] = $object_type;
}
$object_data['type'] = $type;
$object_data['actor'] = $actor;
$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers); $object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
logger('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], LOGGER_DEBUG); logger('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], LOGGER_DEBUG);
@ -174,26 +230,27 @@ class Receiver
} }
/** /**
* * Processes the activity object
* *
* @param array $activity * @param array $activity Array with activity data
* @param $body * @param string $body
* @param integer $uid User ID * @param integer $uid User ID
* @param $trust_source * @param boolean $trust_source Do we trust the source?
*/ */
public static function processActivity($activity, $body = '', $uid = null, $trust_source = false) public static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
{ {
if (empty($activity['type'])) { $type = JsonLD::fetchElement($activity, '@type');
if (!$type) {
logger('Empty type', LOGGER_DEBUG); logger('Empty type', LOGGER_DEBUG);
return; return;
} }
if (empty($activity['object'])) { if (!JsonLD::fetchElement($activity, 'as:object')) {
logger('Empty object', LOGGER_DEBUG); logger('Empty object', LOGGER_DEBUG);
return; return;
} }
if (empty($activity['actor'])) { if (!JsonLD::fetchElement($activity, 'as:actor')) {
logger('Empty actor', LOGGER_DEBUG); logger('Empty actor', LOGGER_DEBUG);
return; return;
@ -207,84 +264,84 @@ class Receiver
} }
if (!$trust_source) { if (!$trust_source) {
logger('No trust for activity type "' . $activity['type'] . '", so we quit now.', LOGGER_DEBUG); logger('No trust for activity type "' . $type . '", so we quit now.', LOGGER_DEBUG);
return; return;
} }
switch ($activity['type']) { switch ($type) {
case 'Create': case 'as:Create':
case 'Announce': case 'as:Announce':
ActivityPub\Processor::createItem($object_data, $body); ActivityPub\Processor::createItem($object_data, $body);
break; break;
case 'Like': case 'as:Like':
ActivityPub\Processor::likeItem($object_data, $body); ActivityPub\Processor::likeItem($object_data, $body);
break; break;
case 'Dislike': case 'as:Dislike':
ActivityPub\Processor::dislikeItem($object_data, $body); ActivityPub\Processor::dislikeItem($object_data, $body);
break; break;
case 'Update': case 'as:Update':
if (in_array($object_data['object_type'], ActivityPub::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
/// @todo /// @todo
} elseif (in_array($object_data['object_type'], ActivityPub::ACCOUNT_TYPES)) { } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
ActivityPub\Processor::updatePerson($object_data, $body); ActivityPub\Processor::updatePerson($object_data, $body);
} }
break; break;
case 'Delete': case 'as:Delete':
if ($object_data['object_type'] == 'Tombstone') { if ($object_data['object_type'] == 'as:Tombstone') {
ActivityPub\Processor::deleteItem($object_data, $body); ActivityPub\Processor::deleteItem($object_data, $body);
} elseif (in_array($object_data['object_type'], ActivityPub::ACCOUNT_TYPES)) { } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
ActivityPub\Processor::deletePerson($object_data, $body); ActivityPub\Processor::deletePerson($object_data, $body);
} }
break; break;
case 'Follow': case 'as:Follow':
ActivityPub\Processor::followUser($object_data); ActivityPub\Processor::followUser($object_data);
break; break;
case 'Accept': case 'as:Accept':
if ($object_data['object_type'] == 'Follow') { if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::acceptFollowUser($object_data); ActivityPub\Processor::acceptFollowUser($object_data);
} }
break; break;
case 'Reject': case 'as:Reject':
if ($object_data['object_type'] == 'Follow') { if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::rejectFollowUser($object_data); ActivityPub\Processor::rejectFollowUser($object_data);
} }
break; break;
case 'Undo': case 'as:Undo':
if ($object_data['object_type'] == 'Follow') { if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::undoFollowUser($object_data); ActivityPub\Processor::undoFollowUser($object_data);
} elseif (in_array($object_data['object_type'], ActivityPub::ACTIVITY_TYPES)) { } elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) {
ActivityPub\Processor::undoActivity($object_data); ActivityPub\Processor::undoActivity($object_data);
} }
break; break;
default: default:
logger('Unknown activity: ' . $activity['type'], LOGGER_DEBUG); logger('Unknown activity: ' . $type, LOGGER_DEBUG);
break; break;
} }
} }
/** /**
* * Fetch the receiver list from an activity array
* *
* @param array $activity * @param array $activity
* @param $actor * @param string $actor
* *
* @return * @return array with receivers (user id)
*/ */
private static function getReceivers($activity, $actor) private static function getReceivers($activity, $actor)
{ {
$receivers = []; $receivers = [];
// When it is an answer, we inherite the receivers from the parent // When it is an answer, we inherite the receivers from the parent
$replyto = JsonLD::fetchElement($activity, 'inReplyTo', 'id'); $replyto = JsonLD::fetchElement($activity, 'as:inReplyTo');
if (!empty($replyto)) { if (!empty($replyto)) {
$parents = Item::select(['uid'], ['uri' => $replyto]); $parents = Item::select(['uid'], ['uri' => $replyto]);
while ($parent = Item::fetch($parents)) { while ($parent = Item::fetch($parents)) {
@ -302,22 +359,18 @@ class Receiver
$followers = ''; $followers = '';
} }
foreach (['to', 'cc', 'bto', 'bcc'] as $element) { foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
if (empty($activity[$element])) { $receiver_list = JsonLD::fetchElementArray($activity, $element);
if (empty($receiver_list)) {
continue; continue;
} }
// The receiver can be an array or a string foreach ($receiver_list as $receiver) {
if (is_string($activity[$element])) { if ($receiver == self::PUBLIC_COLLECTION) {
$activity[$element] = [$activity[$element]];
}
foreach ($activity[$element] as $receiver) {
if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
$receivers['uid:0'] = 0; $receivers['uid:0'] = 0;
} }
if (($receiver == ActivityPub::PUBLIC_COLLECTION) && !empty($actor)) { if (($receiver == self::PUBLIC_COLLECTION) && !empty($actor)) {
// This will most likely catch all OStatus connections to Mastodon // This will most likely catch all OStatus connections to Mastodon
$condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND] $condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]
, 'archive' => false, 'pending' => false]; , 'archive' => false, 'pending' => false];
@ -330,7 +383,7 @@ class Receiver
DBA::close($contacts); DBA::close($contacts);
} }
if (in_array($receiver, [$followers, ActivityPub::PUBLIC_COLLECTION]) && !empty($actor)) { if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
$condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND], $condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false]; 'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
$contacts = DBA::select('contact', ['uid'], $condition); $contacts = DBA::select('contact', ['uid'], $condition);
@ -425,19 +478,19 @@ class Receiver
private static function addActivityFields($object_data, $activity) private static function addActivityFields($object_data, $activity)
{ {
if (!empty($activity['published']) && empty($object_data['published'])) { if (!empty($activity['published']) && empty($object_data['published'])) {
$object_data['published'] = $activity['published']; $object_data['published'] = JsonLD::fetchElement($activity, 'published', '@value');
} }
if (!empty($activity['updated']) && empty($object_data['updated'])) { if (!empty($activity['updated']) && empty($object_data['updated'])) {
$object_data['updated'] = $activity['updated']; $object_data['updated'] = JsonLD::fetchElement($activity, 'updated', '@value');
} }
if (!empty($activity['diaspora:guid']) && empty($object_data['diaspora:guid'])) { if (!empty($activity['diaspora:guid']) && empty($object_data['diaspora:guid'])) {
$object_data['diaspora:guid'] = $activity['diaspora:guid']; $object_data['diaspora:guid'] = JsonLD::fetchElement($activity, 'diaspora:guid');
} }
if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) { if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) {
$object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo', 'id'); $object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo');
} }
if (!empty($activity['instrument'])) { if (!empty($activity['instrument'])) {
@ -447,109 +500,183 @@ class Receiver
} }
/** /**
* * Fetches the object data from external ressources if needed
* *
* @param $object_id * @param string $object_id Object ID of the the provided object
* @param $object * @param array $object The provided object array
* @param $trust_source * @param boolean $trust_source Do we trust the provided object?
* *
* @return * @return array with trusted and valid object data
*/ */
private static function fetchObject($object_id, $object = [], $trust_source = false) private static function fetchObject($object_id, $object = [], $trust_source = false)
{ {
if (!$trust_source || is_string($object)) { // By fetching the type we check if the object is complete.
$type = JsonLD::fetchElement($object, '@type');
if (!$trust_source || empty($type)) {
$data = ActivityPub::fetchContent($object_id); $data = ActivityPub::fetchContent($object_id);
if (empty($data)) { if (!empty($data)) {
logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG); $object = JsonLD::compact($data);
$data = $object_id;
} else {
logger('Fetched content for ' . $object_id, LOGGER_DEBUG); logger('Fetched content for ' . $object_id, LOGGER_DEBUG);
} else {
logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
$item = Item::selectFirst([], ['uri' => $object_id]);
if (!DBA::isResult($item)) {
logger('Object with url ' . $object_id . ' was not found locally.', LOGGER_DEBUG);
return false;
}
logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
$data = ActivityPub\Transmitter::createNote($item);
$object = JsonLD::compact($data);
} }
} else { } else {
logger('Using original object for url ' . $object_id, LOGGER_DEBUG); logger('Using original object for url ' . $object_id, LOGGER_DEBUG);
$data = $object;
} }
if (is_string($data)) { $type = JsonLD::fetchElement($object, '@type');
$item = Item::selectFirst([], ['uri' => $data]);
if (!DBA::isResult($item)) {
logger('Object with url ' . $data . ' was not found locally.', LOGGER_DEBUG);
return false;
}
logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
$data = ActivityPub\Transmitter::createNote($item);
}
if (empty($data['type'])) { if (empty($type)) {
logger('Empty type', LOGGER_DEBUG); logger('Empty type', LOGGER_DEBUG);
return false; return false;
} }
if (in_array($data['type'], ActivityPub::CONTENT_TYPES)) { if (in_array($type, self::CONTENT_TYPES)) {
return self::processObject($data); return self::processObject($object);
} }
if ($data['type'] == 'Announce') { if ($type == 'as:Announce') {
if (empty($data['object'])) { $object_id = JsonLD::fetchElement($object, 'object');
if (empty($object_id)) {
return false; return false;
} }
return self::fetchObject($data['object']); return self::fetchObject($object_id);
} }
logger('Unhandled object type: ' . $data['type'], LOGGER_DEBUG); logger('Unhandled object type: ' . $type, LOGGER_DEBUG);
} }
/** /**
* * Convert tags from JSON-LD format into a simplified format
* *
* @param $object * @param array $tags Tags in JSON-LD format
* *
* @return * @return array with tags in a simplified format
*/
private static function processTags($tags)
{
$taglist = [];
if (empty($tags)) {
return [];
}
foreach ($tags as $tag) {
if (empty($tag)) {
continue;
}
$taglist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type')),
'href' => JsonLD::fetchElement($tag, 'as:href'),
'name' => JsonLD::fetchElement($tag, 'as:name')];
}
return $taglist;
}
/**
* Convert attachments from JSON-LD format into a simplified format
*
* @param array $attachments Attachments in JSON-LD format
*
* @return array with attachmants in a simplified format
*/
private static function processAttachments($attachments)
{
$attachlist = [];
if (empty($attachments)) {
return [];
}
foreach ($attachments as $attachment) {
if (empty($attachment)) {
continue;
}
$attachlist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType'),
'name' => JsonLD::fetchElement($attachment, 'as:name'),
'url' => JsonLD::fetchElement($attachment, 'as:url')];
}
return $attachlist;
}
/**
* Fetches data from the object part of an activity
*
* @param array $object
*
* @return array
*/ */
private static function processObject($object) private static function processObject($object)
{ {
if (empty($object['id'])) { if (!JsonLD::fetchElement($object, '@id')) {
return false; return false;
} }
$object_data = []; $object_data = [];
$object_data['object_type'] = $object['type']; $object_data['object_type'] = JsonLD::fetchElement($object, '@type');
$object_data['id'] = $object['id']; $object_data['id'] = JsonLD::fetchElement($object, '@id');
if (!empty($object['inReplyTo'])) { $object_data['reply-to-id'] = JsonLD::fetchElement($object, 'as:inReplyTo');
$object_data['reply-to-id'] = JsonLD::fetchElement($object, 'inReplyTo', 'id');
} else { if (empty($object_data['reply-to-id'])) {
$object_data['reply-to-id'] = $object_data['id']; $object_data['reply-to-id'] = $object_data['id'];
} }
$object_data['published'] = defaults($object, 'published', null); $object_data['published'] = JsonLD::fetchElement($object, 'as:published', '@value');
$object_data['updated'] = defaults($object, 'updated', $object_data['published']); $object_data['updated'] = JsonLD::fetchElement($object, 'as:updated', '@value');
if (empty($object_data['updated'])) {
$object_data['updated'] = $object_data['published'];
}
if (empty($object_data['published']) && !empty($object_data['updated'])) { if (empty($object_data['published']) && !empty($object_data['updated'])) {
$object_data['published'] = $object_data['updated']; $object_data['published'] = $object_data['updated'];
} }
$actor = JsonLD::fetchElement($object, 'attributedTo', 'id'); $actor = JsonLD::fetchElement($object, 'as:attributedTo');
if (empty($actor)) { if (empty($actor)) {
$actor = defaults($object, 'actor', null); $actor = JsonLD::fetchElement($object, 'as:actor');
} }
$object_data['diaspora:guid'] = defaults($object, 'diaspora:guid', null); $object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid');
$object_data['owner'] = $object_data['author'] = $actor; $object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment');
$object_data['context'] = defaults($object, 'context', null); $object_data['actor'] = $object_data['author'] = $actor;
$object_data['conversation'] = defaults($object, 'conversation', null); $object_data['context'] = JsonLD::fetchElement($object, 'as:context');
$object_data['sensitive'] = defaults($object, 'sensitive', null); $object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation');
$object_data['name'] = defaults($object, 'title', null); $object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive');
$object_data['name'] = defaults($object, 'name', $object_data['name']); $object_data['name'] = JsonLD::fetchElement($object, 'as:name');
$object_data['summary'] = defaults($object, 'summary', null); $object_data['summary'] = JsonLD::fetchElement($object, 'as:summary');
$object_data['content'] = defaults($object, 'content', null); $object_data['content'] = JsonLD::fetchElement($object, 'as:content');
$object_data['source'] = defaults($object, 'source', null); $object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode');
$object_data['location'] = JsonLD::fetchElement($object, 'location', 'name', 'type', 'Place'); $object_data['location'] = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place');
$object_data['attachments'] = defaults($object, 'attachment', null); $object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment'));
$object_data['tags'] = defaults($object, 'tag', null); $object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag'));
$object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service'); // $object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service'); // todo
$object_data['alternate-url'] = JsonLD::fetchElement($object, 'url', 'href'); $object_data['service'] = null;
$object_data['receiver'] = self::getReceivers($object, $object_data['owner']); $object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url');
// Special treatment for Hubzilla links
if (is_array($object_data['alternate-url'])) {
if (!empty($object['as:url'])) {
$object_data['alternate-url'] = JsonLD::fetchElement($object['as:url'], 'as:href');
} else {
$object_data['alternate-url'] = null;
}
}
$object_data['receiver'] = self::getReceivers($object, $object_data['actor']);
// Common object data: // Common object data:

4
src/Protocol/ActivityPub/Transmitter.php
View File

@ -29,6 +29,10 @@ use Friendica\Core\Cache;
* *
* To-Do: * To-Do:
* *
* Missing object fields:
* - service (App)
* - location
*
* Missing object types: * Missing object types:
* - Event * - Event
* *

87
src/Util/JsonLD.php
View File

@ -82,10 +82,12 @@ class JsonLD
{ {
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#',
'w3sec' => 'https://w3id.org/security', 'w3id' => 'https://w3id.org/security#',
'ostatus' => (object)['@id' => 'http://ostatus.org#', '@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'],
'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']]; 'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
@ -95,6 +97,45 @@ class JsonLD
return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true); return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
} }
/**
* @brief Fetches an element array from a JSON array
*
* @param $array
* @param $element
* @param $key
*
* @return fetched element array
*/
public static function fetchElementArray($array, $element, $key = '@id')
{
if (empty($array)) {
return null;
}
if (!isset($array[$element])) {
return null;
}
// If it isn't an array yet, make it to one
if (!is_int(key($array[$element]))) {
$array[$element] = [$array[$element]];
}
$elements = [];
foreach ($array[$element] as $entry) {
if (!is_array($entry)) {
$elements[] = $entry;
} elseif (!empty($entry[$key])) {
$elements[] = $entry[$key];
} else {
$elements[] = $entry;
}
}
return $elements;
}
/** /**
* @brief Fetches an element from a JSON array * @brief Fetches an element from a JSON array
* *
@ -106,38 +147,40 @@ class JsonLD
* *
* @return fetched element * @return fetched element
*/ */
public static function fetchElement($array, $element, $key, $type = null, $type_value = null) public static function fetchElement($array, $element, $key = '@id', $type = null, $type_value = null)
{ {
if (empty($array)) { if (empty($array)) {
return false; return null;
} }
if (empty($array[$element])) { if (!isset($array[$element])) {
return false; return null;
} }
if (is_string($array[$element])) { if (!is_array($array[$element])) {
return $array[$element]; return $array[$element];
} }
if (is_null($type_value)) { if (is_null($type) || is_null($type_value)) {
if (!empty($array[$element][$key])) { $element_array = self::fetchElementArray($array, $element, $key);
return $array[$element][$key]; if (is_null($element_array)) {
return null;
} }
if (!empty($array[$element][0][$key])) { return array_shift($element_array);
return $array[$element][0][$key]; }
$element_array = self::fetchElementArray($array, $element);
if (is_null($element_array)) {
return null;
}
foreach ($element_array as $entry) {
if (isset($entry[$key]) && isset($entry[$type]) && ($entry[$type] == $type_value)) {
return $entry[$key];
} }
return false;
} }
if (!empty($array[$element][$key]) && !empty($array[$element][$type]) && ($array[$element][$type] == $type_value)) { return null;
return $array[$element][$key];
}
/// @todo Add array search
return false;
} }
} }