fix: attempt to make share conflict resolution more resilient to false positives

Signed-off-by: Robin Appelman <robin@icewind.nl>

Author: icewind1991

apps/files_sharing/lib/ShareTargetValidator.php

@@ -85,6 +85,7 @@ public function verifyMountPoint(
 		}
 
 		$newAbsoluteMountPoint = $this->generateUniqueTarget(
+			$share,
 			Filesystem::normalizePath($absoluteParent . '/' . $mountPoint),
 			$parentMount,
 			$allCachedMounts,
@@ -107,7 +108,12 @@ public function verifyMountPoint(
 	/**
 	 * @param ICachedMountInfo[] $allCachedMounts
 	 */
-	private function generateUniqueTarget(string $absolutePath, IMountPoint $parentMount, array $allCachedMounts): string {
+	private function generateUniqueTarget(
+		IShare $share,
+		string $absolutePath,
+		IMountPoint $parentMount,
+		array $allCachedMounts,
+	): string {
 		$pathInfo = pathinfo($absolutePath);
 		$ext = isset($pathInfo['extension']) ? '.' . $pathInfo['extension'] : '';
 		$name = $pathInfo['filename'];
@@ -116,7 +122,7 @@ private function generateUniqueTarget(string $absolutePath, IMountPoint $parentM
 		$i = 2;
 		$parentCache = $parentMount->getStorage()->getCache();
 		$internalPath = $parentMount->getInternalPath($absolutePath);
-		while ($parentCache->inCache($internalPath) || isset($allCachedMounts[$absolutePath . '/'])) {
+		while ($parentCache->inCache($internalPath) || $this->hasConflictingMount($share, $allCachedMounts, $absolutePath)) {
 			$absolutePath = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
 			$internalPath = $parentMount->getInternalPath($absolutePath);
 			$i++;
@@ -125,6 +131,23 @@ private function generateUniqueTarget(string $absolutePath, IMountPoint $parentM
 		return $absolutePath;
 	}
 
+	/**
+	 * @param ICachedMountInfo[] $allCachedMounts
+	 */
+	private function hasConflictingMount(IShare $share, array $allCachedMounts, string $absolutePath): bool {
+		if (!isset($allCachedMounts[$absolutePath . '/'])) {
+			return false;
+		}
+
+		$mount = $allCachedMounts[$absolutePath . '/'];
+		if ($mount->getMountProvider() === MountProvider::class && $mount->getRootId() === $share->getNodeId()) {
+			// "conflicting" mount is a mount for the current share
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * update fileTarget in the database if the mount point changed
 	 *