Happy New Year 2023!

[friendica.git] / src / Module / ActivityPub / Objects.php

diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 5798c5685da7b93940d999218c06f847e016c612..fd3a2d66c34717532dcfebb27d3f0fdda0681026 100644 (file)
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,9 +29,9 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
+use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -41,7 +41,7 @@ use Friendica\Util\Strings;
  */
 class Objects extends BaseModule
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                if (empty($this->parameters['guid'])) {
                        throw new HTTPException\BadRequestException();
@@ -70,33 +70,25 @@ class Objects extends BaseModule
                        }
                }
 
-               $item = Post::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity', 'deleted', 'parent-uri-id'],
-                       ['uri-id' => $itemuri['id']], ['order' => ['origin' => true]]);
-
+               $item = Post::selectFirst([], ['uri-id' => $itemuri['id'], 'origin' => true]);
                if (!DBA::isResult($item)) {
                        throw new HTTPException\NotFoundException();
                }
 
-               $validated = in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]);
+               $owner = User::getById($item['uid'], ['hidewall']);
+
+               $validated = empty($owner['hidewall']) && in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]);
 
                if (!$validated) {
                        $requester = HTTPSignature::getSigner('', $_SERVER);
-                       if (!empty($requester) && $item['origin']) {
-                               $requester_id = Contact::getIdForURL($requester, $item['uid']);
-                               if (!empty($requester_id)) {
-                                       $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $item['uid']);
-                                       $psids = array_merge($permissionSets->column('id'), [PermissionSet::PUBLIC]);
-                                       $validated = in_array($item['psid'], $psids);
-                               }
-                       }
-               }
-
-               if ($validated) {
-                       // Valid items are original post or posted from this node (including in the case of a forum)
-                       $validated = ($item['origin'] || (parse_url($item['author-link'], PHP_URL_HOST) == parse_url(DI::baseUrl()->get(), PHP_URL_HOST)));
+                       if (!empty($requester)) {
+                               $receivers = Item::enumeratePermissions($item, false);
+                               $receivers[] = $item['contact-id'];
 
-                       if (!$validated && $item['deleted']) {
-                               $validated = Post::exists(['origin' => true, 'uri-id' => $item['parent-uri-id']]);
+                               $validated = in_array(Contact::getIdForURL($requester, $item['uid']), $receivers);
+                               if (!$validated) {
+                                       $validated = in_array(Contact::getIdForURL($requester), $receivers);
+                               }
                        }
                }
 
@@ -108,8 +100,8 @@ class Objects extends BaseModule
                $last_modified = $item['changed'];
                Network::checkEtagModified($etag, $last_modified);
 
-               if (empty($this->parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
-                       $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
+               if (empty($this->parameters['activity']) && ($item['gravity'] != Item::GRAVITY_ACTIVITY)) {
+                       $activity = ActivityPub\Transmitter::createCachedActivityFromItem($item['id'], false, true);
                        if (empty($activity['type'])) {
                                throw new HTTPException\NotFoundException();
                        }
@@ -126,7 +118,7 @@ class Objects extends BaseModule
                } elseif (empty($this->parameters['activity']) || in_array($this->parameters['activity'],
                        ['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject',
                        'TentativeAccept', 'Follow', 'Add'])) {
-                       $data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
+                       $data = ActivityPub\Transmitter::createCachedActivityFromItem($item['id']);
                        if (empty($data)) {
                                throw new HTTPException\NotFoundException();
                        }
@@ -140,6 +132,7 @@ class Objects extends BaseModule
 
                // Relaxed CORS header for public items
                header('Access-Control-Allow-Origin: *');
+
                System::jsonExit($data, 'application/activity+json');
        }
 }