X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FObjects.php;h=bb68adeb3bb8cf7b35563e05ca03f840f835fc78;hb=6778d4f7ce62877f46b964d2a6abc17e8faa47bd;hp=8080289f15866143a2207209d56d3666df448964;hpb=e5a336ff77f76741f8a7580677628cc58bce7478;p=friendica.git

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 8080289f15..bb68adeb3b 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -25,9 +25,11 @@ use Friendica\BaseModule;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 
 /**
@@ -45,19 +47,32 @@ class Objects extends BaseModule
 			DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
 		}
 
-		/// @todo Add Authentication to enable fetching of non public content
-		// $requester = HTTPSignature::getSigner('', $_SERVER);
+		$item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity'],
+			['guid' => $parameters['guid']], ['order' => ['origin' => true]]);
+
+		if (!DBA::isResult($item)) {
+			throw new HTTPException\NotFoundException();
+		}
+
+		$validated = 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']);
+					if (!empty($permissionSets)) {
+						$psid = array_merge($permissionSets->column('id'),
+							[DI::permissionSet()->getIdFromACL($item['uid'], '', '', '', '')]);
+						$validated = in_array($item['psid'], $psid);
+					}
+				}
+			}
+		}
 
-		$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'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) {
+		if (!$validated || !$item['origin'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) {
 			throw new HTTPException\NotFoundException();
 		}
 
@@ -65,7 +80,7 @@ class Objects extends BaseModule
 		$last_modified = $item['changed'];
 		Network::checkEtagModified($etag, $last_modified);
 
-		if (empty($parameters['activity'])) {
+		if (empty($parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
 			$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
 			$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
 
@@ -76,13 +91,14 @@ class Objects extends BaseModule
 
 			$data = ['@context' => ActivityPub::CONTEXT];
 			$data = array_merge($data, $activity['object']);
-		} elseif (in_array($parameters['activity'], ['Create', 'Announce', 'Update', 
-			'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add'])) {
+		} elseif (empty($parameters['activity']) || in_array($parameters['activity'],
+			['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject',
+			'TentativeAccept', 'Follow', 'Add'])) {
 			$data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
 			if (empty($data)) {
 				throw new HTTPException\NotFoundException();
 			}
-			if ($parameters['activity'] != 'Create') {
+			if (!empty($parameters['activity']) && ($parameters['activity'] != 'Create')) {
 				$data['type'] = $parameters['activity'];
 				$data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
 			}