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

Merge pull request #9207 from annando/relay-posts 

Process incoming relay posts / fix importing posts
This commit is contained in:
Hypolite Petovan 2020-09-14 19:28:55 -04:00 committed by GitHub
parent 87e0ba2af6 4930991734
commit ca624ec612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -711,15 +711,22 @@ class Processor
return '';
}
if (!empty($child['author'])) {
$actor = $child['author'];
} elseif (!empty($object['actor'])) {
$actor = $object['actor'];
if (!empty($object['actor'])) {
$object_actor = $object['actor'];
} elseif (!empty($object['attributedTo'])) {
$actor = $object['attributedTo'];
$object_actor = $object['attributedTo'];
} else {
// Shouldn't happen
$actor = '';
$object_actor = '';
}
$signer = [$object_actor];
if (!empty($child['author'])) {
$actor = $child['author'];
$signer[] = $actor;
} else {
$actor = $object_actor;
}
if (!empty($object['published'])) {
@ -745,7 +752,7 @@ class Processor
$ldactivity['thread-completion'] = true;
ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, [$actor]);
ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer);
Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);

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

@ -88,6 +88,22 @@ class Receiver
*/
public static function processInbox($body, $header, $uid)
{
$activity = json_decode($body, true);
if (empty($activity)) {
Logger::warning('Invalid body.');
return;
}
$ldactivity = JsonLD::compact($activity);
$actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id');
$apcontact = APContact::getByURL($actor);
if (!empty($apcontact) && ($apcontact['type'] == 'Application') && ($apcontact['nick'] == 'relay')) {
self::processRelayPost($ldactivity);
return;
}
$http_signer = HTTPSignature::getSigner($body, $header);
if (empty($http_signer)) {
Logger::warning('Invalid HTTP signature, message will be discarded.');
@ -97,16 +113,6 @@ class Receiver
}
$signer = [$http_signer];
$activity = json_decode($body, true);
if (empty($activity)) {
Logger::warning('Invalid body.');
return;
}
$ldactivity = JsonLD::compact($activity);
$actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id');
Logger::info('Message for user ' . $uid . ' is from actor ' . $actor);
@ -141,6 +147,40 @@ class Receiver
self::processActivity($ldactivity, $body, $uid, $trust_source, true, $signer);
}
/**
* Process incoming posts from relays
*
* @param array $activity
* @return void
*/
private static function processRelayPost(array $activity)
{
$type = JsonLD::fetchElement($activity, '@type');
if (!$type) {
Logger::info('Empty type', ['activity' => $activity]);
return;
}
if ($type != 'as:Announce') {
Logger::info('Not an announcement', ['activity' => $activity]);
}
$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
if (empty($object_id)) {
Logger::info('No object id found', ['activity' => $activity]);
}
Logger::info('Got relayed message id', ['id' => $object_id]);
$item_id = Item::searchByLink($object_id);
if ($item_id) {
Logger::info('Relayed message already exists', ['id' => $object_id, 'item' => $item_id]);
return;
}
Processor::fetchMissingActivity($object_id);
}
/**
* Fetches the object type for a given object id
*
@ -438,6 +478,7 @@ class Receiver
$object_data['thread-completion'] = true;
$item = ActivityPub\Processor::createItem($object_data);
$item['post-type'] = Item::PT_ANNOUNCEMENT;
ActivityPub\Processor::postItem($object_data, $item);
$announce_object_data = self::processObject($activity);