Test against server branch

.github/workflows/integration-pgsql.yml

@@ -69,7 +69,7 @@ jobs:
           - 'sharing-3'
           - 'sharing-4'
         php-versions: ['8.3']
-        server-versions: ['master']
+        server-versions: ['share-mount-validation-on-share']
         guests-versions: ['main']
         circles-versions: ['master']
         notifications-versions: ['master']

lib/Service/ParticipantService.php

@@ -8,9 +8,11 @@
 
 namespace OCA\Talk\Service;
 
+use OC\User\LazyUser;
 use OCA\Circles\CirclesManager;
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Member;
+use OCA\Files_Sharing\Event\UserShareAccessUpdatedEvent;
 use OCA\Talk\CachePrefix;
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Config;
@@ -629,6 +631,11 @@
 				}
 
 				$readPrivacy = $this->talkConfig->getUserReadPrivacy($participant['actorId']);
+
+				// Clear share access cache
+				$user = new LazyUser($participant['actorId'], $this->userManager);
+				$event = new UserShareAccessUpdatedEvent($user);
+				$this->dispatcher->dispatchTyped($event);
 			} elseif ($participant['actorType'] === Attendee::ACTOR_FEDERATED_USERS) {
 				if ($addedBy === null) {
 					throw new \Exception('$addedBy must be set to add a federated user');
@@ -1103,6 +1110,13 @@
 		$this->sessionMapper->deleteByAttendeeId($participant->getAttendee()->getId());
 		$this->attendeeMapper->delete($participant->getAttendee());
 
+		if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
+			// Clear share access cache
+			$user = new LazyUser($participant->getAttendee()->getActorId(), $this->userManager);
+			$event = new UserShareAccessUpdatedEvent($user);
+			$this->dispatcher->dispatchTyped($event);
+		}
+
 		$event = new AttendeeRemovedEvent($room, $participant->getAttendee(), $reason, $sessions);
 		$this->dispatcher->dispatchTyped($event);
 
@@ -1251,6 +1265,10 @@
 
 		$this->attendeeMapper->delete($attendee);
 
+		// Clear share access cache
+		$event = new UserShareAccessUpdatedEvent($user);
+		$this->dispatcher->dispatchTyped($event);
+
 		$attendeeEvent = new AttendeeRemovedEvent($room, $attendee, $reason, $sessions);
 		$this->dispatcher->dispatchTyped($attendeeEvent);
 

lib/Service/RoomService.php

@@ -9,6 +9,8 @@
 namespace OCA\Talk\Service;
 
 use InvalidArgumentException;
+use OC\User\LazyUser;
+use OCA\Files_Sharing\Event\UserShareAccessUpdatedEvent;
 use OCA\Talk\Config;
 use OCA\Talk\Events\AParticipantModifiedEvent;
 use OCA\Talk\Events\ARoomModifiedEvent;
@@ -63,6 +65,7 @@
 use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\IUser;
+use OCP\IUserManager;
 use OCP\Log\Audit\CriticalActionPerformedEvent;
 use OCP\Security\Events\ValidatePasswordPolicyEvent;
 use OCP\Security\IHasher;
@@ -89,6 +92,7 @@
 		protected LoggerInterface $logger,
 		protected IL10N $l10n,
 		protected IManager $calendarManager,
+		protected IUserManager $userManager,
 	) {
 	}
 
@@ -1440,6 +1444,14 @@
 			$delete->executeStatement();
 		}
 
+		// Clear share access cache
+		$userIds = $this->participantService->getParticipantUserIds($room);
+		foreach ($userIds as $userId) {
+			$user = new LazyUser($userId, $this->userManager);
+			$event = new UserShareAccessUpdatedEvent($user);
+			$this->dispatcher->dispatchTyped($event);
+		}
+
 		// Delete attendees
 		$delete = $this->db->getQueryBuilder();
 		$delete->delete('talk_attendees')

lib/Share/RoomShareProvider.php

@@ -9,6 +9,7 @@
 namespace OCA\Talk\Share;
 
 use OC\Files\Cache\Cache;
+use OC\User\LazyUser;
 use OCA\Talk\Events\BeforeDuplicateShareSentEvent;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
@@ -27,13 +28,16 @@
 use OCP\Files\Node;
 use OCP\IDBConnection;
 use OCP\IL10N;
+use OCP\IUser;
+use OCP\IUserManager;
 use OCP\Security\ISecureRandom;
 use OCP\Share\Exceptions\GenericShareException;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager as IShareManager;
 use OCP\Share\IPartialShareProvider;
 use OCP\Share\IShare;
 use OCP\Share\IShareProvider;
+use OCP\Share\IShareProviderGetUsers;
 
 /**
  * Share provider for room shares.
@@ -45,7 +49,7 @@
  * Like in group shares, a recipient can move or delete a share without
  * modifying the share for the other users in the room.
  */
-class RoomShareProvider implements IShareProvider, IPartialShareProvider {
+class RoomShareProvider implements IShareProvider, IPartialShareProvider, IShareProviderGetUsers {
 	use TTransactional;
 	// Special share type for user modified room shares
 	public const SHARE_TYPE_USERROOM = 11;
@@ -66,6 +70,7 @@
 		protected ITimeFactory $timeFactory,
 		private IL10N $l,
 		private IMimeTypeLoader $mimeTypeLoader,
+		private IUserManager $userManager,
 	) {
 		$this->sharesByIdCache = new CappedMemoryCache();
 	}
@@ -1230,4 +1235,30 @@
 		}
 		$cursor->closeCursor();
 	}
+
+	public function getUsersForShare(IShare $share): iterable {
+		if ($share->getShareType() === self::SHARE_TYPE_USERROOM) {
+			// User record for a share, user is the shared_with
+			return [new LazyUser($share->getSharedWith(), $this->userManager)];
+		}
+
+		if ($share->getShareType() !== IShare::TYPE_ROOM) {
+			return [];
+		}
+
+		// Room share entry, shared_with is the conversation token
+		try {
+			$room = $this->manager->getRoomByToken($share->getSharedWith());
+		} catch (RoomNotFoundException) {
+			return [];
+		}
+
+		if ($room->getType() === Room::TYPE_ONE_TO_ONE) {
+			return array_map(fn (string $userId): IUser => new LazyUser($userId, $this->userManager), json_decode($room->getName(), true));
+		}
+
+		// Get all user ids for the room
+		$userIds = $this->participantService->getParticipantUserIds($room);
+		return array_map(fn (string $userId): IUser => new LazyUser($userId, $this->userManager), $userIds);
+	}
 }

tests/php/Service/RoomServiceTest.php

@@ -30,6 +30,7 @@
 use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\IUser;
+use OCP\IUserManager;
 use OCP\Security\IHasher;
 use OCP\Server;
 use OCP\Share\IManager as IShareManager;
@@ -52,6 +53,7 @@ class RoomServiceTest extends TestCase {
 	protected LoggerInterface&MockObject $logger;
 	protected IL10N&MockObject $l10n;
 	protected IManager $calendarManager;
+	protected IUserManager&MockObject $userManager;
 	protected EmojiService $emojiService;
 	protected ?RoomService $service = null;
 
@@ -70,6 +72,7 @@ public function setUp(): void {
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->emojiService = Server::get(EmojiService::class);
 		$this->calendarManager = $this->createMock(IManager::class);
+		$this->userManager = $this->createMock(IUserManager::class);
 		$this->service = new RoomService(
 			$this->manager,
 			$this->participantService,
@@ -84,6 +87,7 @@ public function setUp(): void {
 			$this->logger,
 			$this->l10n,
 			$this->calendarManager,
+			$this->userManager,
 		);
 	}
 
@@ -340,6 +344,7 @@ public function testVerifyPassword(): void {
 			$this->logger,
 			$this->l10n,
 			$this->calendarManager,
+			$this->userManager,
 		);
 
 		$room = new Room(