mirror of
https://github.com/friendica/friendica
synced 2025-05-22 14:24:12 +02:00
Merge remote-tracking branch 'friendica/stable' into develop
# Conflicts: # composer.lock
This commit is contained in:
Hypolite Petovan
commit
a852455d0e
154 changed files with 26577 additions and 25630 deletions
|
|
@ -206,9 +206,6 @@ class Processor
|
|||
} else {
|
||||
$item['gravity'] = GRAVITY_COMMENT;
|
||||
$item['object-type'] = Activity\ObjectType::COMMENT;
|
||||
|
||||
// Ensure that the comment reaches all receivers of the referring post
|
||||
$activity['receiver'] = self::addReceivers($activity);
|
||||
}
|
||||
|
||||
if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
|
||||
|
|
@ -275,6 +272,7 @@ class Processor
|
|||
|
||||
$item = self::processContent($activity, $item);
|
||||
if (empty($item)) {
|
||||
Logger::info('Message was not processed');
|
||||
return [];
|
||||
}
|
||||
|
||||
|
|
@ -330,35 +328,6 @@ class Processor
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add users to the receiver list of the given public activity.
|
||||
* This is used to ensure that the activity will be stored in every thread.
|
||||
*
|
||||
* @param array $activity Activity array
|
||||
* @return array Modified receiver list
|
||||
*/
|
||||
private static function addReceivers(array $activity)
|
||||
{
|
||||
if (!in_array(0, $activity['receiver'])) {
|
||||
// Private activities will not be modified
|
||||
return $activity['receiver'];
|
||||
}
|
||||
|
||||
// Add all owners of the referring item to the receivers
|
||||
$original = $receivers = $activity['receiver'];
|
||||
$items = Item::select(['uid'], ['uri' => $activity['object_id']]);
|
||||
while ($item = DBA::fetch($items)) {
|
||||
$receivers['uid:' . $item['uid']] = $item['uid'];
|
||||
}
|
||||
DBA::close($items);
|
||||
|
||||
if (count($original) != count($receivers)) {
|
||||
Logger::info('Improved data', ['id' => $activity['id'], 'object' => $activity['object_id'], 'original' => $original, 'improved' => $receivers]);
|
||||
}
|
||||
|
||||
return $receivers;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare the item array for an activity
|
||||
*
|
||||
|
|
@ -377,8 +346,6 @@ class Processor
|
|||
|
||||
$item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';
|
||||
|
||||
$activity['receiver'] = self::addReceivers($activity);
|
||||
|
||||
self::postItem($activity, $item);
|
||||
}
|
||||
|
||||
|
|
@ -527,6 +494,33 @@ class Processor
|
|||
|
||||
$item['uid'] = $receiver;
|
||||
|
||||
$type = $activity['reception_type'][$receiver] ?? Receiver::TARGET_UNKNOWN;
|
||||
switch($type) {
|
||||
case Receiver::TARGET_TO:
|
||||
$item['post-type'] = Item::PT_TO;
|
||||
break;
|
||||
case Receiver::TARGET_CC:
|
||||
$item['post-type'] = Item::PT_CC;
|
||||
break;
|
||||
case Receiver::TARGET_BTO:
|
||||
$item['post-type'] = Item::PT_BTO;
|
||||
break;
|
||||
case Receiver::TARGET_BCC:
|
||||
$item['post-type'] = Item::PT_BCC;
|
||||
break;
|
||||
case Receiver::TARGET_FOLLOWER:
|
||||
$item['post-type'] = Item::PT_FOLLOWER;
|
||||
break;
|
||||
case Receiver::TARGET_ANSWER:
|
||||
$item['post-type'] = Item::PT_COMMENT;
|
||||
break;
|
||||
case Receiver::TARGET_GLOBAL:
|
||||
$item['post-type'] = Item::PT_GLOBAL;
|
||||
break;
|
||||
default:
|
||||
$item['post-type'] = Item::PT_ARTICLE;
|
||||
}
|
||||
|
||||
if ($item['isForum'] ?? false) {
|
||||
$item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver);
|
||||
} else {
|
||||
|
|
@ -718,15 +712,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'])) {
|
||||
|
|
@ -752,7 +753,7 @@ class Processor
|
|||
|
||||
$ldactivity['thread-completion'] = true;
|
||||
|
||||
ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity));
|
||||
ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer);
|
||||
|
||||
Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use Friendica\Model\Item;
|
|||
use Friendica\Model\User;
|
||||
use Friendica\Protocol\Activity;
|
||||
use Friendica\Protocol\ActivityPub;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\HTTPSignature;
|
||||
use Friendica\Util\JsonLD;
|
||||
use Friendica\Util\LDSignature;
|
||||
|
|
@ -59,6 +58,15 @@ class Receiver
|
|||
const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event', 'as:Audio'];
|
||||
const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept'];
|
||||
|
||||
const TARGET_UNKNOWN = 0;
|
||||
const TARGET_TO = 1;
|
||||
const TARGET_CC = 2;
|
||||
const TARGET_BTO = 3;
|
||||
const TARGET_BCC = 4;
|
||||
const TARGET_FOLLOWER = 5;
|
||||
const TARGET_ANSWER = 6;
|
||||
const TARGET_GLOBAL = 7;
|
||||
|
||||
/**
|
||||
* Checks if the web request is done for the AP protocol
|
||||
*
|
||||
|
|
@ -80,16 +88,7 @@ class Receiver
|
|||
*/
|
||||
public static function processInbox($body, $header, $uid)
|
||||
{
|
||||
$http_signer = HTTPSignature::getSigner($body, $header);
|
||||
if (empty($http_signer)) {
|
||||
Logger::warning('Invalid HTTP signature, message will be discarded.');
|
||||
return;
|
||||
} else {
|
||||
Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
|
||||
}
|
||||
|
||||
$activity = json_decode($body, true);
|
||||
|
||||
if (empty($activity)) {
|
||||
Logger::warning('Invalid body.');
|
||||
return;
|
||||
|
|
@ -99,12 +98,30 @@ class Receiver
|
|||
|
||||
$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.');
|
||||
return;
|
||||
} else {
|
||||
Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
|
||||
}
|
||||
|
||||
$signer = [$http_signer];
|
||||
|
||||
Logger::info('Message for user ' . $uid . ' is from actor ' . $actor);
|
||||
|
||||
if (LDSignature::isSigned($activity)) {
|
||||
$ld_signer = LDSignature::getSigner($activity);
|
||||
if (empty($ld_signer)) {
|
||||
Logger::log('Invalid JSON-LD signature from ' . $actor, Logger::DEBUG);
|
||||
} elseif ($ld_signer != $http_signer) {
|
||||
$signer[] = $ld_signer;
|
||||
}
|
||||
if (!empty($ld_signer && ($actor == $http_signer))) {
|
||||
Logger::log('The HTTP and the JSON-LD signature belong to ' . $ld_signer, Logger::DEBUG);
|
||||
|
|
@ -127,7 +144,50 @@ class Receiver
|
|||
$trust_source = false;
|
||||
}
|
||||
|
||||
self::processActivity($ldactivity, $body, $uid, $trust_source, true);
|
||||
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]);
|
||||
return;
|
||||
}
|
||||
|
||||
$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
|
||||
if (empty($object_id)) {
|
||||
Logger::info('No object id found', ['activity' => $activity]);
|
||||
return;
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
$item_id = Item::searchByLink($object_id);
|
||||
if ($item_id) {
|
||||
Logger::info('Relayed message had been fetched and stored', ['id' => $object_id, 'item' => $item_id]);
|
||||
} else {
|
||||
Logger::notice('Relayed message had not been stored', ['id' => $object_id]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -186,29 +246,53 @@ class Receiver
|
|||
*/
|
||||
public static function prepareObjectData($activity, $uid, $push, &$trust_source)
|
||||
{
|
||||
$id = JsonLD::fetchElement($activity, '@id');
|
||||
if (!empty($id) && !$trust_source) {
|
||||
$fetched_activity = ActivityPub::fetchContent($id, $uid ?? 0);
|
||||
if (!empty($fetched_activity)) {
|
||||
$object = JsonLD::compact($fetched_activity);
|
||||
$fetched_id = JsonLD::fetchElement($object, '@id');
|
||||
if ($fetched_id == $id) {
|
||||
Logger::info('Activity had been fetched successfully', ['id' => $id]);
|
||||
$trust_source = true;
|
||||
$activity = $object;
|
||||
} else {
|
||||
Logger::info('Activity id is not equal', ['id' => $id, 'fetched' => $fetched_id]);
|
||||
}
|
||||
} else {
|
||||
Logger::info('Activity could not been fetched', ['id' => $id]);
|
||||
}
|
||||
}
|
||||
|
||||
$actor = JsonLD::fetchElement($activity, 'as:actor', '@id');
|
||||
if (empty($actor)) {
|
||||
Logger::log('Empty actor', Logger::DEBUG);
|
||||
Logger::info('Empty actor', ['activity' => $activity]);
|
||||
return [];
|
||||
}
|
||||
|
||||
$type = JsonLD::fetchElement($activity, '@type');
|
||||
|
||||
// Fetch all receivers from to, cc, bto and bcc
|
||||
$receivers = self::getReceivers($activity, $actor);
|
||||
$receiverdata = self::getReceivers($activity, $actor);
|
||||
$receivers = $reception_types = [];
|
||||
foreach ($receiverdata as $key => $data) {
|
||||
$receivers[$key] = $data['uid'];
|
||||
$reception_types[$data['uid']] = $data['type'] ?? 0;
|
||||
}
|
||||
|
||||
// When it is a delivery to a personal inbox we add that user to the receivers
|
||||
if (!empty($uid)) {
|
||||
$additional = ['uid:' . $uid => $uid];
|
||||
$receivers = array_merge($receivers, $additional);
|
||||
if (empty($reception_types[$uid]) || in_array($reception_types[$uid], [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER, self::TARGET_GLOBAL])) {
|
||||
$reception_types[$uid] = self::TARGET_BCC;
|
||||
}
|
||||
} else {
|
||||
// We possibly need some user to fetch private content,
|
||||
// so we fetch the first out ot the list.
|
||||
$uid = self::getFirstUserFromReceivers($receivers);
|
||||
}
|
||||
|
||||
Logger::log('Receivers: ' . $uid . ' - ' . json_encode($receivers), Logger::DEBUG);
|
||||
|
||||
$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
|
||||
if (empty($object_id)) {
|
||||
Logger::log('No object found', Logger::DEBUG);
|
||||
|
|
@ -224,11 +308,8 @@ class Receiver
|
|||
|
||||
// Fetch the content only on activities where this matters
|
||||
if (in_array($type, ['as:Create', 'as:Update', 'as:Announce'])) {
|
||||
if ($type == 'as:Announce') {
|
||||
$trust_source = false;
|
||||
}
|
||||
|
||||
$object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $uid);
|
||||
// Always fetch on "Announce"
|
||||
$object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source && ($type != 'as:Announce'), $uid);
|
||||
if (empty($object_data)) {
|
||||
Logger::log("Object data couldn't be processed", Logger::DEBUG);
|
||||
return [];
|
||||
|
|
@ -248,9 +329,6 @@ class Receiver
|
|||
} else {
|
||||
$object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage');
|
||||
}
|
||||
|
||||
// We had been able to retrieve the object data - so we can trust the source
|
||||
$trust_source = true;
|
||||
} elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Follow'])) && in_array($object_type, self::CONTENT_TYPES)) {
|
||||
// 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.
|
||||
|
|
@ -290,6 +368,19 @@ class Receiver
|
|||
$object_data['actor'] = $actor;
|
||||
$object_data['item_receiver'] = $receivers;
|
||||
$object_data['receiver'] = array_merge($object_data['receiver'] ?? [], $receivers);
|
||||
$object_data['reception_type'] = array_merge($object_data['reception_type'] ?? [], $reception_types);
|
||||
|
||||
$author = $object_data['author'] ?? $actor;
|
||||
if (!empty($author) && !empty($object_data['id'])) {
|
||||
$author_host = parse_url($author, PHP_URL_HOST);
|
||||
$id_host = parse_url($object_data['id'], PHP_URL_HOST);
|
||||
if ($author_host == $id_host) {
|
||||
Logger::info('Valid hosts', ['type' => $type, 'host' => $id_host]);
|
||||
} else {
|
||||
Logger::notice('Differing hosts on author and id', ['type' => $type, 'author' => $author_host, 'id' => $id_host]);
|
||||
$trust_source = false;
|
||||
}
|
||||
}
|
||||
|
||||
Logger::log('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], Logger::DEBUG);
|
||||
|
||||
|
|
@ -322,43 +413,49 @@ class Receiver
|
|||
* @param boolean $push Message had been pushed to our system
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function processActivity($activity, $body = '', $uid = null, $trust_source = false, $push = false)
|
||||
public static function processActivity($activity, string $body = '', int $uid = null, bool $trust_source = false, bool $push = false, array $signer = [])
|
||||
{
|
||||
$type = JsonLD::fetchElement($activity, '@type');
|
||||
if (!$type) {
|
||||
Logger::log('Empty type', Logger::DEBUG);
|
||||
Logger::info('Empty type', ['activity' => $activity]);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!JsonLD::fetchElement($activity, 'as:object', '@id')) {
|
||||
Logger::log('Empty object', Logger::DEBUG);
|
||||
Logger::info('Empty object', ['activity' => $activity]);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!JsonLD::fetchElement($activity, 'as:actor', '@id')) {
|
||||
Logger::log('Empty actor', Logger::DEBUG);
|
||||
$actor = JsonLD::fetchElement($activity, 'as:actor', '@id');
|
||||
if (empty($actor)) {
|
||||
Logger::info('Empty actor', ['activity' => $activity]);
|
||||
return;
|
||||
}
|
||||
|
||||
// Don't trust the source if "actor" differs from "attributedTo". The content could be forged.
|
||||
if ($trust_source && ($type == 'as:Create') && is_array($activity['as:object'])) {
|
||||
$actor = JsonLD::fetchElement($activity, 'as:actor', '@id');
|
||||
if (is_array($activity['as:object'])) {
|
||||
$attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo', '@id');
|
||||
$trust_source = ($actor == $attributed_to);
|
||||
if (!$trust_source) {
|
||||
Logger::log('Not trusting actor: ' . $actor . '. It differs from attributedTo: ' . $attributed_to, Logger::DEBUG);
|
||||
} else {
|
||||
$attributed_to = '';
|
||||
}
|
||||
|
||||
// Test the provided signatures against the actor and "attributedTo"
|
||||
if ($trust_source) {
|
||||
if (!empty($attributed_to) && !empty($actor)) {
|
||||
$trust_source = (in_array($actor, $signer) && in_array($attributed_to, $signer));
|
||||
} else {
|
||||
$trust_source = in_array($actor, $signer);
|
||||
}
|
||||
}
|
||||
|
||||
// $trust_source is called by reference and is set to true if the content was retrieved successfully
|
||||
$object_data = self::prepareObjectData($activity, $uid, $push, $trust_source);
|
||||
if (empty($object_data)) {
|
||||
Logger::log('No object data found', Logger::DEBUG);
|
||||
Logger::info('No object data found', ['activity' => $activity]);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!$trust_source) {
|
||||
Logger::log('No trust for activity type "' . $type . '", so we quit now.', Logger::DEBUG);
|
||||
Logger::info('Activity trust could not be achieved.', ['id' => $object_data['object_id'], 'type' => $type, 'signer' => $signer, 'actor' => $actor, 'attributedTo' => $attributed_to]);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -390,6 +487,11 @@ class Receiver
|
|||
$object_data['thread-completion'] = true;
|
||||
|
||||
$item = ActivityPub\Processor::createItem($object_data);
|
||||
if (empty($item)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$item['post-type'] = Item::PT_ANNOUNCEMENT;
|
||||
ActivityPub\Processor::postItem($object_data, $item);
|
||||
|
||||
$announce_object_data = self::processObject($activity);
|
||||
|
|
@ -498,18 +600,30 @@ class Receiver
|
|||
*/
|
||||
private static function getReceivers($activity, $actor, $tags = [], $fetch_unlisted = false)
|
||||
{
|
||||
$receivers = [];
|
||||
$reply = $receivers = [];
|
||||
|
||||
// When it is an answer, we inherite the receivers from the parent
|
||||
$replyto = JsonLD::fetchElement($activity, 'as:inReplyTo', '@id');
|
||||
if (!empty($replyto)) {
|
||||
$reply = [$replyto];
|
||||
|
||||
// Fix possibly wrong item URI (could be an answer to a plink uri)
|
||||
$fixedReplyTo = Item::getURIByLink($replyto);
|
||||
$replyto = $fixedReplyTo ?: $replyto;
|
||||
if (!empty($fixedReplyTo)) {
|
||||
$reply[] = $fixedReplyTo;
|
||||
}
|
||||
}
|
||||
|
||||
$parents = Item::select(['uid'], ['uri' => $replyto]);
|
||||
// Fetch all posts that refer to the object id
|
||||
$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
|
||||
if (!empty($object_id)) {
|
||||
$reply[] = $object_id;
|
||||
}
|
||||
|
||||
if (!empty($reply)) {
|
||||
$parents = Item::select(['uid'], ['uri' => $reply]);
|
||||
while ($parent = Item::fetch($parents)) {
|
||||
$receivers['uid:' . $parent['uid']] = $parent['uid'];
|
||||
$receivers['uid:' . $parent['uid']] = ['uid' => $parent['uid'], 'type' => self::TARGET_ANSWER];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -519,7 +633,7 @@ class Receiver
|
|||
|
||||
Logger::log('Actor: ' . $actor . ' - Followers: ' . $followers, Logger::DEBUG);
|
||||
} else {
|
||||
Logger::log('Empty actor', Logger::DEBUG);
|
||||
Logger::info('Empty actor', ['activity' => $activity]);
|
||||
$followers = '';
|
||||
}
|
||||
|
||||
|
|
@ -531,29 +645,17 @@ class Receiver
|
|||
|
||||
foreach ($receiver_list as $receiver) {
|
||||
if ($receiver == self::PUBLIC_COLLECTION) {
|
||||
$receivers['uid:0'] = 0;
|
||||
$receivers['uid:0'] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
|
||||
}
|
||||
|
||||
// Add receiver "-1" for unlisted posts
|
||||
if ($fetch_unlisted && ($receiver == self::PUBLIC_COLLECTION) && ($element == 'as:cc')) {
|
||||
$receivers['uid:-1'] = -1;
|
||||
}
|
||||
|
||||
if (($receiver == self::PUBLIC_COLLECTION) && !empty($actor)) {
|
||||
// This will most likely catch all OStatus connections to Mastodon
|
||||
$condition = ['alias' => [$actor, Strings::normaliseLink($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]
|
||||
, 'archive' => false, 'pending' => false];
|
||||
$contacts = DBA::select('contact', ['uid'], $condition);
|
||||
while ($contact = DBA::fetch($contacts)) {
|
||||
if ($contact['uid'] != 0) {
|
||||
$receivers['uid:' . $contact['uid']] = $contact['uid'];
|
||||
}
|
||||
}
|
||||
DBA::close($contacts);
|
||||
$receivers['uid:-1'] = ['uid' => -1, 'type' => self::TARGET_GLOBAL];
|
||||
}
|
||||
|
||||
// Fetch the receivers for the public and the followers collection
|
||||
if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
|
||||
$receivers = array_merge($receivers, self::getReceiverForActor($actor, $tags));
|
||||
$receivers = self::getReceiverForActor($actor, $tags, $receivers);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -581,7 +683,25 @@ class Receiver
|
|||
}
|
||||
}
|
||||
|
||||
$receivers['uid:' . $contact['uid']] = $contact['uid'];
|
||||
$type = $receivers['uid:' . $contact['uid']]['type'] ?? self::TARGET_UNKNOWN;
|
||||
if (in_array($type, [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER, self::TARGET_GLOBAL])) {
|
||||
switch ($element) {
|
||||
case 'as:to':
|
||||
$type = self::TARGET_TO;
|
||||
break;
|
||||
case 'as:cc':
|
||||
$type = self::TARGET_CC;
|
||||
break;
|
||||
case 'as:bto':
|
||||
$type = self::TARGET_BTO;
|
||||
break;
|
||||
case 'as:bcc':
|
||||
$type = self::TARGET_BCC;
|
||||
break;
|
||||
}
|
||||
|
||||
$receivers['uid:' . $contact['uid']] = ['uid' => $contact['uid'], 'type' => $type];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -599,16 +719,26 @@ class Receiver
|
|||
* @return array with receivers (user id)
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function getReceiverForActor($actor, $tags)
|
||||
private static function getReceiverForActor($actor, $tags, $receivers)
|
||||
{
|
||||
$receivers = [];
|
||||
$networks = Protocol::FEDERATED;
|
||||
$condition = ['nurl' => Strings::normaliseLink($actor), 'rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER],
|
||||
'network' => $networks, 'archive' => false, 'pending' => false];
|
||||
$basecondition = ['rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER],
|
||||
'network' => Protocol::FEDERATED, 'archive' => false, 'pending' => false];
|
||||
|
||||
$condition = DBA::mergeConditions($basecondition, ['nurl' => Strings::normaliseLink($actor)]);
|
||||
$contacts = DBA::select('contact', ['uid', 'rel'], $condition);
|
||||
while ($contact = DBA::fetch($contacts)) {
|
||||
if (self::isValidReceiverForActor($contact, $actor, $tags)) {
|
||||
$receivers['uid:' . $contact['uid']] = $contact['uid'];
|
||||
if (empty($receivers['uid:' . $contact['uid']]) && self::isValidReceiverForActor($contact, $actor, $tags)) {
|
||||
$receivers['uid:' . $contact['uid']] = ['uid' => $contact['uid'], 'type' => self::TARGET_FOLLOWER];
|
||||
}
|
||||
}
|
||||
DBA::close($contacts);
|
||||
|
||||
// The queries are split because of performance issues
|
||||
$condition = DBA::mergeConditions($basecondition, ["`alias` IN (?, ?)", Strings::normaliseLink($actor), $actor]);
|
||||
$contacts = DBA::select('contact', ['uid', 'rel'], $condition);
|
||||
while ($contact = DBA::fetch($contacts)) {
|
||||
if (empty($receivers['uid:' . $contact['uid']]) && self::isValidReceiverForActor($contact, $actor, $tags)) {
|
||||
$receivers['uid:' . $contact['uid']] = ['uid' => $contact['uid'], 'type' => self::TARGET_FOLLOWER];
|
||||
}
|
||||
}
|
||||
DBA::close($contacts);
|
||||
|
|
@ -699,14 +829,14 @@ class Receiver
|
|||
}
|
||||
|
||||
foreach ($receivers as $receiver) {
|
||||
$contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'nurl' => Strings::normaliseLink($actor)]);
|
||||
$contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver['uid'], 'network' => Protocol::OSTATUS, 'nurl' => Strings::normaliseLink($actor)]);
|
||||
if (DBA::isResult($contact)) {
|
||||
self::switchContact($contact['id'], $receiver, $actor);
|
||||
self::switchContact($contact['id'], $receiver['uid'], $actor);
|
||||
}
|
||||
|
||||
$contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'alias' => [Strings::normaliseLink($actor), $actor]]);
|
||||
$contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver['uid'], 'network' => Protocol::OSTATUS, 'alias' => [Strings::normaliseLink($actor), $actor]]);
|
||||
if (DBA::isResult($contact)) {
|
||||
self::switchContact($contact['id'], $receiver, $actor);
|
||||
self::switchContact($contact['id'], $receiver['uid'], $actor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -778,18 +908,29 @@ class Receiver
|
|||
$data = ActivityPub\Transmitter::createNote($item);
|
||||
$object = JsonLD::compact($data);
|
||||
}
|
||||
|
||||
$id = JsonLD::fetchElement($object, '@id');
|
||||
if (empty($id)) {
|
||||
Logger::info('Empty id');
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($id != $object_id) {
|
||||
Logger::info('Fetched id differs from provided id', ['provided' => $object_id, 'fetched' => $id]);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
Logger::log('Using original object for url ' . $object_id, Logger::DEBUG);
|
||||
}
|
||||
|
||||
$type = JsonLD::fetchElement($object, '@type');
|
||||
|
||||
if (empty($type)) {
|
||||
Logger::log('Empty type', Logger::DEBUG);
|
||||
Logger::info('Empty type');
|
||||
return false;
|
||||
}
|
||||
|
||||
if (in_array($type, self::CONTENT_TYPES)) {
|
||||
// We currently don't handle 'pt:CacheFile', but with this step we avoid logging
|
||||
if (in_array($type, self::CONTENT_TYPES) || ($type == 'pt:CacheFile')) {
|
||||
$object_data = self::processObject($object);
|
||||
|
||||
if (!empty($data)) {
|
||||
|
|
@ -1189,7 +1330,16 @@ class Receiver
|
|||
$object_data = self::processAttachmentUrls($object, $object_data);
|
||||
}
|
||||
|
||||
$object_data['receiver'] = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
|
||||
$receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
|
||||
$receivers = $reception_types = [];
|
||||
foreach ($receiverdata as $key => $data) {
|
||||
$receivers[$key] = $data['uid'];
|
||||
$reception_types[$data['uid']] = $data['type'] ?? 0;
|
||||
}
|
||||
|
||||
$object_data['receiver'] = $receivers;
|
||||
$object_data['reception_type'] = $reception_types;
|
||||
|
||||
$object_data['unlisted'] = in_array(-1, $object_data['receiver']);
|
||||
unset($object_data['receiver']['uid:-1']);
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,68 @@ require_once 'mod/share.php';
|
|||
*/
|
||||
class Transmitter
|
||||
{
|
||||
/**
|
||||
* Add relay servers to the list of inboxes
|
||||
*
|
||||
* @param array $inboxes
|
||||
* @return array inboxes with added relay servers
|
||||
*/
|
||||
public static function addRelayServerInboxes(array $inboxes)
|
||||
{
|
||||
$contacts = DBA::select('apcontact', ['inbox'],
|
||||
["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))",
|
||||
'Application', 0, Contact::FOLLOWER, Contact::FRIEND]);
|
||||
while ($contact = DBA::fetch($contacts)) {
|
||||
$inboxes[] = $contact['inbox'];
|
||||
}
|
||||
DBA::close($contacts);
|
||||
|
||||
return $inboxes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Subscribe to a relay
|
||||
*
|
||||
* @param string $url Subscribe actor url
|
||||
* @return bool success
|
||||
*/
|
||||
public static function sendRelayFollow(string $url)
|
||||
{
|
||||
$contact_id = Contact::getIdForURL($url);
|
||||
if (!$contact_id) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
|
||||
$success = ActivityPub\Transmitter::sendActivity('Follow', $url, 0, $activity_id);
|
||||
if ($success) {
|
||||
DBA::update('contact', ['rel' => Contact::FRIEND], ['id' => $contact_id]);
|
||||
}
|
||||
|
||||
return $success;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unsubscribe from a relay
|
||||
*
|
||||
* @param string $url Subscribe actor url
|
||||
* @return bool success
|
||||
*/
|
||||
public static function sendRelayUndoFollow(string $url)
|
||||
{
|
||||
$contact_id = Contact::getIdForURL($url);
|
||||
if (!$contact_id) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$success = self::sendContactUndo($url, $contact_id, 0);
|
||||
if ($success) {
|
||||
DBA::update('contact', ['rel' => Contact::SHARING], ['id' => $contact_id]);
|
||||
}
|
||||
|
||||
return $success;
|
||||
}
|
||||
|
||||
/**
|
||||
* Collects a list of contacts of the given owner
|
||||
*
|
||||
|
|
@ -793,6 +855,9 @@ class Transmitter
|
|||
public static function createActivityFromMail($mail_id, $object_mode = false)
|
||||
{
|
||||
$mail = self::ItemArrayFromMail($mail_id);
|
||||
if (empty($mail)) {
|
||||
return [];
|
||||
}
|
||||
$object = self::createNote($mail);
|
||||
|
||||
if (!$object_mode) {
|
||||
|
|
@ -1917,18 +1982,19 @@ class Transmitter
|
|||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @throws \ImagickException
|
||||
* @throws \Exception
|
||||
* @return bool success
|
||||
*/
|
||||
public static function sendContactUndo($target, $cid, $uid)
|
||||
{
|
||||
$profile = APContact::getByURL($target);
|
||||
if (empty($profile['inbox'])) {
|
||||
Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
$object_id = self::activityIDFromContact($cid);
|
||||
if (empty($object_id)) {
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
$id = DI::baseUrl() . '/activity/' . System::createGUID();
|
||||
|
|
@ -1947,7 +2013,7 @@ class Transmitter
|
|||
Logger::log('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
|
||||
|
||||
$signed = LDSignature::sign($data, $owner);
|
||||
HTTPSignature::transmit($signed, $profile['inbox'], $uid);
|
||||
return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
|
||||
}
|
||||
|
||||
private static function prependMentions($body, int $uriid)
|
||||
|
|
|
|||
|
|
@ -1499,8 +1499,9 @@ class DFRN
|
|||
|
||||
$fields = ['id', 'uid', 'url', 'network', 'avatar-date', 'avatar', 'name-date', 'uri-date', 'addr',
|
||||
'name', 'nick', 'about', 'location', 'keywords', 'xmpp', 'bdyear', 'bd', 'hidden', 'contact-type'];
|
||||
$condition = ["`uid` = ? AND `nurl` = ? AND `network` != ?",
|
||||
$importer["importer_uid"], Strings::normaliseLink($author["link"]), Protocol::STATUSNET];
|
||||
$condition = ["`uid` = ? AND `nurl` = ? AND `network` != ? AND NOT `pending` AND NOT `blocked` AND `rel` IN (?, ?)",
|
||||
$importer["importer_uid"], Strings::normaliseLink($author["link"]), Protocol::STATUSNET,
|
||||
Contact::SHARING, Contact::FRIEND];
|
||||
$contact_old = DBA::selectFirst('contact', $fields, $condition);
|
||||
|
||||
if (DBA::isResult($contact_old)) {
|
||||
|
|
@ -1512,8 +1513,9 @@ class DFRN
|
|||
}
|
||||
|
||||
$author["contact-unknown"] = true;
|
||||
$author["contact-id"] = $importer["id"];
|
||||
$author["network"] = $importer["network"];
|
||||
$contact = Contact::getByURL($author["link"], null, ["id", "network"]);
|
||||
$author["contact-id"] = $contact["id"] ?? $importer["id"];
|
||||
$author["network"] = $contact["network"] ?? $importer["network"];
|
||||
$onlyfetch = true;
|
||||
}
|
||||
|
||||
|
|
@ -1766,15 +1768,15 @@ class DFRN
|
|||
|
||||
$msg = [];
|
||||
$msg["uid"] = $importer["importer_uid"];
|
||||
$msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
|
||||
$msg["from-url"] = $xpath->query("dfrn:sender/dfrn:uri/text()", $mail)->item(0)->nodeValue;
|
||||
$msg["from-photo"] = $xpath->query("dfrn:sender/dfrn:avatar/text()", $mail)->item(0)->nodeValue;
|
||||
$msg["from-name"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:name/text()", $mail);
|
||||
$msg["from-url"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:uri/text()", $mail);
|
||||
$msg["from-photo"] = XML::getFirstValue($xpath, "dfrn:sender/dfrn:avatar/text()", $mail);
|
||||
$msg["contact-id"] = $importer["id"];
|
||||
$msg["uri"] = $xpath->query("dfrn:id/text()", $mail)->item(0)->nodeValue;
|
||||
$msg["parent-uri"] = $xpath->query("dfrn:in-reply-to/text()", $mail)->item(0)->nodeValue;
|
||||
$msg["created"] = DateTimeFormat::utc($xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue);
|
||||
$msg["title"] = $xpath->query("dfrn:subject/text()", $mail)->item(0)->nodeValue;
|
||||
$msg["body"] = $xpath->query("dfrn:content/text()", $mail)->item(0)->nodeValue;
|
||||
$msg["uri"] = XML::getFirstValue($xpath, "dfrn:id/text()", $mail);
|
||||
$msg["parent-uri"] = XML::getFirstValue($xpath, "dfrn:in-reply-to/text()", $mail);
|
||||
$msg["created"] = DateTimeFormat::utc(XML::getFirstValue($xpath, "dfrn:sentdate/text()", $mail));
|
||||
$msg["title"] = XML::getFirstValue($xpath, "dfrn:subject/text()", $mail);
|
||||
$msg["body"] = XML::getFirstValue($xpath, "dfrn:content/text()", $mail);
|
||||
|
||||
Mail::insert($msg);
|
||||
}
|
||||
|
|
@ -2534,6 +2536,11 @@ class DFRN
|
|||
}
|
||||
|
||||
if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) {
|
||||
// Will be overwritten for sharing accounts in Item::insert
|
||||
if (empty($item['post-type']) && ($entrytype == DFRN::REPLY)) {
|
||||
$item['post-type'] = Item::PT_COMMENT;
|
||||
}
|
||||
|
||||
$posted_id = Item::insert($item);
|
||||
if ($posted_id) {
|
||||
Logger::log("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, Logger::DEBUG);
|
||||
|
|
|
|||
|
|
@ -1735,6 +1735,9 @@ class Diaspora
|
|||
$datarray["owner-link"] = $contact["url"];
|
||||
$datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
|
||||
|
||||
// Will be overwritten for sharing accounts in Item::insert
|
||||
$datarray['post-type'] = ($datarray["uid"] == 0) ? Item::PT_GLOBAL : Item::PT_COMMENT;
|
||||
|
||||
$datarray["guid"] = $guid;
|
||||
$datarray["uri"] = self::getUriFromGuid($author, $guid);
|
||||
$datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
|
||||
|
|
@ -2862,6 +2865,10 @@ class Diaspora
|
|||
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
|
||||
$datarray["source"] = $xml;
|
||||
|
||||
if ($datarray["uid"] == 0) {
|
||||
$datarray["post-type"] = Item::PT_GLOBAL;
|
||||
}
|
||||
|
||||
$datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
|
||||
|
||||
self::storeMentions($datarray['uri-id'], $text);
|
||||
|
|
|
|||
|
|
@ -494,6 +494,9 @@ class Feed
|
|||
}
|
||||
$item["body"] = HTML::toBBCode($body, $basepath);
|
||||
|
||||
// Remove tracking pixels
|
||||
$item["body"] = preg_replace("/\[img=1x1\]([^\[\]]*)\[\/img\]/Usi", '', $item["body"]);
|
||||
|
||||
if (($item["body"] == '') && ($item["title"] != '')) {
|
||||
$item["body"] = $item["title"];
|
||||
$item["title"] = '';
|
||||
|
|
@ -533,6 +536,9 @@ class Feed
|
|||
$replace = true;
|
||||
}
|
||||
|
||||
$saved_body = $item["body"];
|
||||
$saved_title = $item["title"];
|
||||
|
||||
if ($replace) {
|
||||
$item["body"] = trim($item["title"]);
|
||||
}
|
||||
|
|
@ -549,9 +555,24 @@ class Feed
|
|||
}
|
||||
}
|
||||
|
||||
$data = PageInfo::queryUrl($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"] ?? '');
|
||||
|
||||
// Take the data that was provided by the feed if the query is empty
|
||||
if (($data['type'] == 'link') && empty($data['title']) && empty($data['text'])) {
|
||||
$data['title'] = $saved_title;
|
||||
$item["body"] = $saved_body;
|
||||
}
|
||||
|
||||
$data_text = strip_tags(trim($data['text'] ?? ''));
|
||||
$item_body = strip_tags(trim($item['body'] ?? ''));
|
||||
|
||||
if (!empty($data_text) && (($data_text == $item_body) || strstr($item_body, $data_text))) {
|
||||
$data['text'] = '';
|
||||
}
|
||||
|
||||
// We always strip the title since it will be added in the page information
|
||||
$item["title"] = "";
|
||||
$item["body"] = $item["body"] . "\n" . PageInfo::getFooterFromUrl($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"] ?? '');
|
||||
$item["body"] = $item["body"] . "\n" . PageInfo::getFooterFromData($data, false);
|
||||
$taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '') : [];
|
||||
$item["object-type"] = Activity\ObjectType::BOOKMARK;
|
||||
unset($item["attach"]);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue