Merge pull request #2338 from nextcloud/fix/share_path_matching

fix: do not ignore shares if child share is missing

Author: artonge

lib/Db/CoreQueryBuilder.php

@@ -346,11 +346,27 @@ public function limitToFileSource(int $nodeId): void {
 	}
 
 	public function limitToFileTarget(string $target, string $alias): void {
-		$this->exprLimit('file_target', $target, $alias);
+		$this->andWhere(
+			$this->expr()->orX(
+				$this->exprLimit('file_target', $target, $alias),
+				$this->expr()->andX(
+					$this->exprLimitNull('file_target', false, $alias),
+					$this->exprLimit('file_target', $target),
+				),
+			),
+		);
 	}
 
 	public function limitToFileTargetLike(string $target, string $alias): void {
-		$this->exprLike('file_target', $target, $alias);
+		$this->andWhere(
+			$this->expr()->orX(
+				$this->exprLike('file_target', $target, $alias),
+				$this->expr()->andX(
+					$this->exprLimitNull('file_target', false, $alias),
+					$this->exprLike('file_target', $target),
+				),
+			),
+		);
 	}
 
 	/**

lib/Db/ShareWrapperRequest.php

@@ -384,9 +384,15 @@ public function getSharedWithByPath(
 		$childAlias = $qb->leftJoinShareChild(CoreQueryBuilder::SHARE);
 
 		if ($forChildren) {
-			$qb->limitToFileTargetLike($path . '_%', $childAlias);
+			$userId = $federatedUser->getUserId();
+			$path = str_replace('/' . $userId . '/files', '', $path);
+			$path = rtrim($path, '/');
+			$childPathTemplate = $this->getQueryBuilder()->getConnection()->escapeLikeParameter($path) . '/_%';
+
+			$qb->limitToFileTargetLike($childPathTemplate, $childAlias);
 		} else {
-			$qb->limitToFileTarget($path, $childAlias);
+			$nonChildPath = $path === '' ? '/' : $path;
+			$qb->limitToFileTarget($nonChildPath, $childAlias);
 		}
 
 		$qb->chunk($probe->getItemsOffset(), $probe->getItemsLimit());