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

Merge pull request #5842 from annando/ap-distribution 

Improved AP distribution / Only process trusted content
This commit is contained in:
Hypolite Petovan 2018-10-06 09:35:44 -04:00 committed by GitHub
parent 58c6ef2bc0 a413ce15aa
commit 2341ce353d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,6 +208,7 @@ 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 "' . $activity['type'] . '", so we quit now.', LOGGER_DEBUG);
return;
} }
switch ($activity['type']) { switch ($activity['type']) {

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

@ -773,7 +773,7 @@ class Transmitter
$data['context'] = self::fetchContextURLForItem($item); $data['context'] = self::fetchContextURLForItem($item);
if (!empty($item['title'])) { if (!empty($item['title'])) {
$data['name'] = BBCode::convert($item['title'], false, 7); $data['name'] = BBCode::toPlaintext($item['title'], false);
} }
$body = $item['body']; $body = $item['body'];

12
src/Worker/Notifier.php
View File

@ -20,6 +20,7 @@ use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
use Friendica\Protocol\Salmon; use Friendica\Protocol\Salmon;
use Friendica\Model\Conversation;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/items.php'; require_once 'include/items.php';
@ -514,6 +515,12 @@ class Notifier
if ($target_item['origin']) { if ($target_item['origin']) {
$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid); $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid);
logger('Origin item ' . $item_id . ' with URL ' . $target_item['uri'] . ' will be distributed.', LOGGER_DEBUG);
} elseif (!DBA::exists('conversation', ['item-uri' => $target_item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB])) {
logger('Remote item ' . $item_id . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.', LOGGER_DEBUG);
return;
} else {
logger('Remote item ' . $item_id . ' with URL ' . $target_item['uri'] . ' will be distributed.', LOGGER_DEBUG);
} }
if ($parent['origin']) { if ($parent['origin']) {
@ -521,6 +528,11 @@ class Notifier
$inboxes = array_merge($inboxes, $parent_inboxes); $inboxes = array_merge($inboxes, $parent_inboxes);
} }
if (empty($inboxes)) {
logger('No inboxes found for item ' . $item_id . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', LOGGER_DEBUG);
return;
}
// Fill the item cache // Fill the item cache
ActivityPub\Transmitter::createCachedActivityFromItem($item_id); ActivityPub\Transmitter::createCachedActivityFromItem($item_id);