fix: resolve share mount for remote circle members

fix: resolve share mount for remote circle members

Signed-off-by: Cristian Scheid <cristianscheid@gmail.com>

[skip ci]

Author: cristianscheid

lib/AppInfo/Application.php

@@ -154,7 +154,7 @@ public function boot(IBootContext $context): void {
 
 	public function registerMountProvider(ContainerInterface $container): void {
 		$configService = $container->get(ConfigService::class);
-		if (!$configService->isGSAvailable()) {
+		if (!$configService->isGSAvailable() && !$configService->isFederatedTeamsEnabled()) {
 			return;
 		}
 

lib/Db/MountPointRequest.php

@@ -49,4 +49,11 @@ public function update(Mountpoint $mountpoint): void {
 			throw new MountNotFoundException('Mount not found');
 		}
 	}
+
+	public function deleteByMountId(string $mountId): void {
+		$qb = $this->getMountPointDeleteSql();
+
+		$qb->limit('mount_id', $mountId);
+		$qb->executeStatement();
+	}
 }

lib/Db/MountRequest.php

@@ -14,6 +14,8 @@
 use OCA\Circles\Exceptions\RequestBuilderException;
 use OCA\Circles\IFederatedUser;
 use OCA\Circles\Model\Mount;
+use OCA\Circles\Service\ConfigService;
+use OCA\Circles\Service\TimezoneService;
 use OCA\Circles\Tools\Traits\TStringTools;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
@@ -25,6 +27,13 @@
 class MountRequest extends MountRequestBuilder {
 	use TStringTools;
 
+	public function __construct(
+		TimezoneService $timezoneService,
+		ConfigService $configService,
+		private MountPointRequest $mountPointRequest,
+	) {
+		parent::__construct($timezoneService, $configService);
+	}
 
 	/**
 	 * @param Mount $mount
@@ -49,10 +58,39 @@ public function save(Mount $mount): void {
 	 * @param string $token
 	 */
 	public function delete(string $token): void {
+		$qb = $this->getMountSelectSql();
+		$qb->limitToToken($token);
+		$mounts = $this->getItemsFromRequest($qb);
+
 		$qb = $this->getMountDeleteSql();
 		$qb->limitToToken($token);
+		$qb->executeStatement();
+
+		foreach ($mounts as $mount) {
+			$this->mountPointRequest->deleteByMountId($mount->getMountId());
+		}
+	}
 
+	public function hasMountForCircleId(string $circleId): bool {
+		$qb = $this->getMountSelectSql();
+		$qb->limitToCircleId($circleId);
+		$qb->setMaxResults(1);
+
+		return count($this->getItemsFromRequest($qb)) > 0;
+	}
+
+	public function deleteByCircleId(string $circleId): void {
+		$qb = $this->getMountSelectSql();
+		$qb->limitToCircleId($circleId);
+		$mounts = $this->getItemsFromRequest($qb);
+
+		$qb = $this->getMountDeleteSql();
+		$qb->limitToCircleId($circleId);
 		$qb->executeStatement();
+
+		foreach ($mounts as $mount) {
+			$this->mountPointRequest->deleteByMountId($mount->getMountId());
+		}
 	}
 
 

lib/Listeners/Files/RemovingMember.php

@@ -11,6 +11,8 @@
 
 namespace OCA\Circles\Listeners\Files;
 
+use OCA\Circles\Db\MemberRequest;
+use OCA\Circles\Db\MountRequest;
 use OCA\Circles\Events\RemovingCircleMemberEvent;
 use OCA\Circles\Exceptions\MembershipNotFoundException;
 use OCA\Circles\Model\Member;
@@ -31,17 +33,23 @@ class RemovingMember implements IEventListener {
 	private MemberService $memberService;
 	private ShareTokenService $shareTokenService;
 	private ShareWrapperService $shareWrapperService;
+	private MemberRequest $memberRequest;
+	private MountRequest $mountRequest;
 
 	public function __construct(
 		LoggerInterface $logger,
 		MemberService $memberService,
 		ShareTokenService $shareTokenService,
 		ShareWrapperService $shareWrapperService,
+		MemberRequest $memberRequest,
+		MountRequest $mountRequest,
 	) {
 		$this->logger = $logger;
 		$this->memberService = $memberService;
 		$this->shareTokenService = $shareTokenService;
 		$this->shareWrapperService = $shareWrapperService;
+		$this->memberRequest = $memberRequest;
+		$this->mountRequest = $mountRequest;
 	}
 
 	public function handle(Event $event): void {
@@ -78,11 +86,50 @@ function (Membership $membership) {
 
 			if ($member->getUserType() === Member::TYPE_USER) {
 				$this->removingSharesInternalMember($member, $singleIds);
+				$this->removingMountsIfLastLocalMember($member, $singleIds);
 			}
 		}
 	}
 
 
+	/**
+	 * A circle mount is created on the local instance when a file or folder is
+	 * shared on the remote instance with a circle that lives there but also has
+	 * members on the local instance. This mount is used by every member of the
+	 * local instance who belongs to that remote circle.
+	 *
+	 * Removing a share on a remote circle only propagates to instances that still
+	 * have a member in that circle. Once the last local member leaves, the local
+	 * instance stops receiving that propagation, so we have to remove the mount
+	 * at this point.
+	 *
+	 * We have to iterate through every parent circle this member's circle belongs
+	 * to, checking for circles where this member leaving would be the last local
+	 * member leaving that circle, and thus where the mount must be removed.
+	 *
+	 * @param Member $member the member being removed
+	 * @param string[] $singleIds parent circles this member's circle belongs to
+	 */
+	private function removingMountsIfLastLocalMember(Member $member, array $singleIds): void {
+		if (!$member->isLocal()) {
+			return;
+		}
+
+		foreach ($singleIds as $singleId) {
+			if (!$this->mountRequest->hasMountForCircleId($singleId)) {
+				continue;
+			}
+
+			foreach ($this->memberRequest->getInheritedMembers($singleId) as $remainingMember) {
+				if ($remainingMember->getUserType() === Member::TYPE_USER && $remainingMember->isLocal()) {
+					continue 2;
+				}
+			}
+
+			$this->mountRequest->deleteByCircleId($singleId);
+		}
+	}
+
 	/**
 	 * @param Member $member
 	 * @param string[] $singleIds

lib/Model/Mount.php

@@ -17,6 +17,7 @@
 use OCA\Circles\Tools\Db\IQueryRow;
 use OCA\Circles\Tools\IDeserializable;
 use OCA\Circles\Tools\Traits\TArrayTools;
+use OCA\Files_Sharing\External\Manager as ExternalShareManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\Http\Client\IClientService;
 

lib/MountManager/CircleMountProvider.php

@@ -25,6 +25,7 @@
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Tools\Traits\TArrayTools;
+use OCA\Files_Sharing\External\Manager as ExternalShareManager;
 use OCA\Files_Sharing\External\Storage as ExternalStorage;
 use OCP\DB\Exception;
 use OCP\Federation\ICloudIdManager;
@@ -53,6 +54,7 @@ public function __construct(
 		private FederatedUserService $federatedUserService,
 		private ConfigService $configService,
 		private LoggerInterface $logger,
+		private ExternalShareManager $externalShareManager,
 	) {
 	}
 

lib/ShareByCircleProvider.php

@@ -888,7 +888,7 @@ public function getAllShares(): iterable {
 	public function getUsersForShare(IShare $share): iterable {
 		$members = $this->shareWrapperService->getShareById((int)$share->getId())->getCircle()->getInheritedMembers();
 		foreach ($members as $member) {
-			if ($member->getUserType() === Member::TYPE_USER) {
+			if ($member->getUserType() === Member::TYPE_USER && $member->isLocal()) {
 				yield $this->userManager->getExistingUser($member->getUserId());
 			}
 		}