From: Hypolite Petovan Date: Sun, 5 Apr 2020 22:00:46 +0000 (-0400) Subject: Rework Module/Objects X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1e32f74b0bd51f78c7d96525781a8317df9e77d3;p=friendica.git Rework Module/Objects - Merge two item queries into one - Add ETag check - Use Router parameter --- diff --git a/mod/display.php b/mod/display.php index fd0079f9f6..107e666d48 100644 --- a/mod/display.php +++ b/mod/display.php @@ -42,7 +42,7 @@ use Friendica\Util\Strings; function display_init(App $a) { if (ActivityPub::isRequest()) { - Objects::rawContent(); + Objects::rawContent(['guid' => $a->argv[1] ?? null]); } if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { diff --git a/src/Module/Objects.php b/src/Module/Objects.php index cce2b73131..0f2536bcc9 100644 --- a/src/Module/Objects.php +++ b/src/Module/Objects.php @@ -22,10 +22,13 @@ namespace Friendica\Module; use Friendica\BaseModule; +use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Item; +use Friendica\Network\HTTPException; use Friendica\Protocol\ActivityPub; +use Friendica\Util\Network; /** * ActivityPub Objects @@ -34,10 +37,8 @@ class Objects extends BaseModule { public static function rawContent(array $parameters = []) { - $a = DI::app(); - - if (empty($a->argv[1])) { - throw new \Friendica\Network\HTTPException\NotFoundException(); + if (empty($parameters['guid'])) { + throw new HTTPException\BadRequestException(); } if (!ActivityPub::isRequest()) { @@ -47,31 +48,34 @@ class Objects extends BaseModule /// @todo Add Authentication to enable fetching of non public content // $requester = HTTPSignature::getSigner('', $_SERVER); - // At first we try the original post with that guid - // @TODO: Replace with parameter from router - $item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => [item::PUBLIC, Item::UNLISTED]]); - if (!DBA::isResult($item)) { - // If no original post could be found, it could possibly be a forum post, there we remove the "origin" field. - // @TODO: Replace with parameter from router - $item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => [item::PUBLIC, Item::UNLISTED]]); - if (!DBA::isResult($item) || !strstr($item['author-link'], DI::baseUrl()->get())) { - throw new \Friendica\Network\HTTPException\NotFoundException(); - } + $item = Item::selectFirst( + ['id', 'origin', 'author-link', 'changed'], + [ + 'guid' => $parameters['guid'], + 'private' => [Item::PUBLIC, Item::UNLISTED] + ], + ['order' => ['origin' => true]] + ); + // Valid items are original post or posted from this node (including in the case of a forum) + if (!DBA::isResult($item) || !$item['origin'] && !strstr($item['author-link'], DI::baseUrl()->get())) { + throw new HTTPException\NotFoundException(); } + $etag = md5($parameters['guid'] . '-' . $item['changed']); + $last_modified = $item['changed']; + Network::checkEtagModified($etag, $last_modified); + $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true); $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type']; // Only display "Create" activity objects here, no reshares or anything else if (empty($activity['object']) || ($activity['type'] != 'Create')) { - throw new \Friendica\Network\HTTPException\NotFoundException(); + throw new HTTPException\NotFoundException(); } $data = ['@context' => ActivityPub::CONTEXT]; $data = array_merge($data, $activity['object']); - header('Content-Type: application/activity+json'); - echo json_encode($data); - exit(); + System::jsonExit($data, 'application/activity+json'); } }