Merge pull request #5533 from nextcloud/bugfix/noid/fix-permission-ch…

…eck-in-background-job fix(activity): Fix permission checks when rendering activities in bac…
nextcloud · Feb 2, 2024 · 74cf8d8 · 74cf8d8
2 parents c0d5633 + 16078a3
commit 74cf8d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
@@ -566,19 +566,19 @@ private function findDetailsForAcl($aclId) {
 		];
 	}
 
-	public function canSeeCardActivity(int $cardId): bool {
+	public function canSeeCardActivity(int $cardId, string $userId): bool {
 		try {
-			$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
+			$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ, $userId);
 			$card = $this->cardMapper->find($cardId);
 			return $card->getDeletedAt() === 0;
 		} catch (NoPermissionException $e) {
 			return false;
 		}
 	}
 
-	public function canSeeBoardActivity(int $boardId): bool {
+	public function canSeeBoardActivity(int $boardId, string $userId): bool {
 		try {
-			$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
+			$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ, $userId);
 			$board = $this->boardMapper->find($boardId);
 			return $board->getDeletedAt() === 0;
 		} catch (NoPermissionException $e) {

diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
@@ -111,7 +111,7 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
 			$event->setAuthor($author);
 		}
 		if ($event->getObjectType() === ActivityManager::DECK_OBJECT_BOARD) {
-			if (!$this->activityManager->canSeeBoardActivity($event->getObjectId())) {
+			if (!$this->activityManager->canSeeBoardActivity($event->getObjectId(), $event->getAffectedUser())) {
 				throw new \InvalidArgumentException();
 			}
 			if (isset($subjectParams['board']) && $event->getObjectName() === '') {
@@ -128,7 +128,7 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
 		}
 
 		if (isset($subjectParams['card']) && $event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
-			if (!$this->activityManager->canSeeCardActivity($event->getObjectId())) {
+			if (!$this->activityManager->canSeeCardActivity($event->getObjectId(), $event->getAffectedUser())) {
 				throw new \InvalidArgumentException();
 			}
 			if ($event->getObjectName() === '') {