remove child shares

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Apr 6, 2022 · 3b5789a · 3b5789a
1 parent 8772511
commit 3b5789a
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 8 deletions.
diff --git a/lib/Db/ShareWrapperRequest.php b/lib/Db/ShareWrapperRequest.php
@@ -431,12 +431,57 @@ public function delete(int $shareId): void {
 	 * @param string $initiator
 	 */
 	public function deleteSharesToCircle(string $circleId, string $initiator = ''): void {
-		$qb = $this->getShareDeleteSql();
-		$qb->andWhere($qb->exprLimit('share_with', $circleId));
+		$qb = $this->getShareSelectSql();
+		$qb->limit('share_with', $circleId);
 		if ($initiator !== '') {
 			$qb->limit('uid_initiator', $initiator);
 		}
 
+		$ids = array_map(
+			function (ShareWrapper $share): string {
+				return $share->getId();
+			},
+			$this->getItemsFromRequest($qb)
+		);
+
+		$this->deleteSharesAndChild($ids);
+	}
+
+
+	public function removeOrphanShares(): void {
+		$qb = $this->getShareSelectSql();
+		$expr = $qb->expr();
+		$qb->leftJoin(
+			CoreQueryBuilder::SHARE, CoreRequestBuilder::TABLE_SHARE, 'p',
+			$expr->andX($expr->eq('p.id', CoreQueryBuilder::SHARE . '.parent'))
+		);
+
+		$qb->filterNull('parent');
+		$qb->limitNull('id', false, 'p');
+
+		$ids = [];
+		$cursor = $qb->execute();
+		while ($data = $cursor->fetch()) {
+			$ids[] = $data['id'];
+		}
+		$cursor->closeCursor();
+
+		$this->deleteSharesAndChild($ids);
+	}
+
+
+	/**
+	 * @param array $ids
+	 */
+	private function deleteSharesAndChild(array $ids): void {
+		$qb = $this->getShareDeleteSql();
+		$qb->andWhere(
+			$qb->expr()->orX(
+				$qb->exprLimitInArray('id', $ids),
+				$qb->exprLimitInArray('parent', $ids)
+			)
+		);
+
 		$qb->execute();
 	}
 }
diff --git a/lib/Listeners/Files/DestroyingCircle.php b/lib/Listeners/Files/DestroyingCircle.php
@@ -77,6 +77,6 @@ public function handle(Event $event): void {
 		}
 
 		$circle = $event->getCircle();
-		$this->shareWrapperService->deleteSharesToCircle($circle->getSingleId(), '', true);
+		$this->shareWrapperService->deleteAllSharesToCircle($circle->getSingleId());
 	}
 }
diff --git a/lib/Listeners/Files/MembershipsRemoved.php b/lib/Listeners/Files/MembershipsRemoved.php
@@ -123,7 +123,7 @@ public function handle(Event $event): void {
 			$federatedUser = $this->circlesManager->getFederatedUser($membership->getSingleId());
 			if ($federatedUser->getUserType() === Member::TYPE_USER
 				&& $federatedUser->isLocal()) {
-				$this->shareWrapperService->deleteSharesToCircle(
+				$this->shareWrapperService->deleteUserSharesToCircle(
 					$membership->getCircleId(),
 					$federatedUser->getUserId()
 				);

diff --git a/lib/Service/MaintenanceService.php b/lib/Service/MaintenanceService.php
@@ -288,6 +288,13 @@ private function runMaintenance5(): void {
 //		} catch (Exception $e) {
 //		}
 
+		try {
+			// Can be removed in NC27.
+			$this->output('Remove orphan shares');
+			$this->removeOrphanShares();
+		} catch (Exception $e) {
+		}
+
 		try {
 			// Can be removed in NC27.
 			$this->output('fix sub-circle display name');
@@ -331,6 +338,14 @@ private function removeMembersWithNoCircles(): void {
 	}
 
 
+	private function removeOrphanShares(): void {
+		$this->shareWrapperRequest->removeOrphanShares();
+	}
+
+
+	/**
+	 * @throws RequestBuilderException
+	 */
 	private function removeDeprecatedShares(): void {
 		$probe = new CircleProbe();
 		$probe->includePersonalCircles()
@@ -353,7 +368,7 @@ function (ShareWrapper $share) {
 
 		foreach ($shares as $share) {
 			if (!in_array($share, $circles)) {
-				$this->shareWrapperService->deleteSharesToCircle($share, '', true);
+				$this->shareWrapperService->deleteAllSharesToCircle($share);
 			}
 		}
 	}

diff --git a/lib/Service/ShareWrapperService.php b/lib/Service/ShareWrapperService.php
@@ -126,16 +126,25 @@ public function delete(ShareWrapper $shareWrapper): void {
 	 *
 	 * @throws Exception
 	 */
-	public function deleteSharesToCircle(string $circleId, string $initiator = '', bool $force = false): void {
-		if ($initiator === '' && !$force) {
-			throw new Exception('if initiator is empty, you need to set $force as true');
+	public function deleteUserSharesToCircle(string $circleId, string $initiator): void {
+		if ($initiator === '') {
+			throw new Exception('$initiator cannot be empty');
 		}
 
 		$this->cache->clear('');
 		$this->shareWrapperRequest->deleteSharesToCircle($circleId, $initiator);
 	}
 
 
+	/**
+	 * @param string $circleId
+	 */
+	public function deleteAllSharesToCircle(string $circleId): void {
+		$this->cache->clear('');
+		$this->shareWrapperRequest->deleteSharesToCircle($circleId, '');
+	}
+
+
 	/**
 	 * @param string $circleId
 	 * @param FederatedUser|null $shareRecipient