Merge pull request #1015 from nextcloud/backport/1000/1000-stable23

[stable23] remove child shares
nextcloud · Apr 14, 2022 · d255537 · d255537
2 parents 594fb08 + a4ccbba
commit d255537
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 9 deletions.
diff --git a/lib/Db/ShareWrapperRequest.php b/lib/Db/ShareWrapperRequest.php
@@ -445,9 +445,57 @@ public function delete(int $shareId): void {
 	/**
 	 * @param string $circleId
 	 */
-	public function deleteFromCircle(string $circleId): void {
+	public function deleteSharesToCircle(string $circleId, string $initiator = ''): void {
+		$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->exprLimit('share_with', $circleId));
+		$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());
+		$this->shareWrapperService->deleteAllSharesToCircle($circle->getSingleId());
 	}
 }
diff --git a/lib/Listeners/Files/MembershipsRemoved.php b/lib/Listeners/Files/MembershipsRemoved.php
@@ -123,9 +123,9 @@ public function handle(Event $event): void {
 			$federatedUser = $this->circlesManager->getFederatedUser($membership->getSingleId());
 			if ($federatedUser->getUserType() === Member::TYPE_USER
 				&& $federatedUser->isLocal()) {
-				$this->shareWrapperRequest->removeByInitiatorAndShareWith(
-					$federatedUser->getUserId(),
-					$membership->getCircleId()
+				$this->shareWrapperService->deleteUserSharesToCircle(
+					$membership->getCircleId(),
+					$federatedUser->getUserId()
 				);
 			}
 		}

diff --git a/lib/Service/MaintenanceService.php b/lib/Service/MaintenanceService.php
@@ -277,6 +277,13 @@ private function runMaintenance5(): void {
 //			$this->refreshDisplayName();
 //		} catch (Exception $e) {
 //		}
+
+		try {
+			// Can be removed in NC27.
+			$this->output('Remove orphan shares');
+			$this->removeOrphanShares();
+		} catch (Exception $e) {
+		}
 	}
 
 
@@ -314,6 +321,14 @@ private function removeMembersWithNoCircles(): void {
 	}
 
 
+	private function removeOrphanShares(): void {
+		$this->shareWrapperRequest->removeOrphanShares();
+	}
+
+
+	/**
+	 * @throws RequestBuilderException
+	 */
 	private function removeDeprecatedShares(): void {
 		$probe = new CircleProbe();
 		$probe->includePersonalCircles()
@@ -336,7 +351,7 @@ function (ShareWrapper $share) {
 
 		foreach ($shares as $share) {
 			if (!in_array($share, $circles)) {
-				$this->shareWrapperRequest->deleteFromCircle($share);
+				$this->shareWrapperService->deleteAllSharesToCircle($share);
 			}
 		}
 	}

diff --git a/lib/Service/ShareWrapperService.php b/lib/Service/ShareWrapperService.php
@@ -31,6 +31,7 @@
 
 namespace OCA\Circles\Service;
 
+use Exception;
 use OCA\Circles\Tools\Traits\TStringTools;
 use OCA\Circles\Db\ShareWrapperRequest;
 use OCA\Circles\Exceptions\RequestBuilderException;
@@ -105,8 +106,20 @@ public function delete(ShareWrapper $shareWrapper): void {
 	/**
 	 * @param string $circleId
 	 */
-	public function deleteSharesToCircle(string $circleId) {
-		$this->shareWrapperRequest->deleteFromCircle($circleId);
+	public function deleteUserSharesToCircle(string $circleId, string $initiator): void {
+		if ($initiator === '') {
+			throw new Exception('$initiator cannot be empty');
+		}
+
+		$this->shareWrapperRequest->deleteSharesToCircle($circleId, $initiator);
+	}
+
+
+	/**
+	 * @param string $circleId
+	 */
+	public function deleteAllSharesToCircle(string $circleId): void {
+		$this->shareWrapperRequest->deleteSharesToCircle($circleId, '');
 	}