Port isTargetAllowed to share 2.0

Author: Vincent Petry

apps/files_sharing/lib/SharedMount.php

@@ -30,6 +30,7 @@
 use OC\Files\Mount\MountPoint;
 use OC\Files\Mount\MoveableMount;
 use OC\Files\View;
+use OCP\Share\IShare;
 
 /**
  * Shared mount points can be moved by the user
@@ -178,13 +179,67 @@ protected function stripUserFilesPath($path) {
 		return '/' . $relPath;
 	}
 
+	/**
+	 * check if it is allowed to move a mount point to a given target.
+	 * It is not allowed to move a mount point into a different mount point or
+	 * into an already shared folder
+	 *
+	 * @param string $target path
+	 * @return boolean
+	 */
+	private function isTargetAllowed($target) {
+		list($targetStorage, $targetInternalPath) = \OC\Files\Filesystem::resolvePath($target);
+		if (!$targetStorage->instanceOfStorage('\OCP\Files\IHomeStorage')) {
+			\OCP\Util::writeLog('files',
+				'It is not allowed to move one mount point into another one',
+				\OCP\Util::DEBUG);
+			return false;
+		}
+
+		// note: cannot use the view because the target is already locked
+		$fileId = (int)$targetStorage->getCache()->getId($targetInternalPath);
+		if ($fileId === -1) {
+			// target might not exist, need to check parent instead
+			$fileId = (int)$targetStorage->getCache()->getId(dirname($targetInternalPath));
+		}
+
+		$targetNodes = \OC::$server->getRootFolder()->getById($fileId);
+		if (empty($targetNodes)) {
+			return false;
+		}
+
+		$shareManager = \OC::$server->getShareManager();
+		$targetNode = $targetNodes[0];
+		// FIXME: make it stop earlier in '/$userId/files'
+		while (!is_null($targetNode) && $targetNode->getPath() !== '/') { 
+			$shares = $shareManager->getSharesByPath($targetNode);
+
+			foreach ($shares as $share) {
+				if ($this->user === $share->getShareOwner()) {
+					\OCP\Util::writeLog('files',
+						'It is not allowed to move one mount point into a shared folder',
+						\OCP\Util::DEBUG);
+					return false;
+				}
+			}
+
+			$targetNode = $targetNode->getParent();
+		}
+
+		return true;
+	}
+
+
 	/**
 	 * Move the mount point to $target
 	 *
 	 * @param string $target the target mount point
 	 * @return bool
 	 */
 	public function moveMount($target) {
+		if (!$this->isTargetAllowed($target)) {
+			return false;
+		}
 
 		$relTargetPath = $this->stripUserFilesPath($target);
 		$share = $this->storage->getShare();

lib/private/Files/View.php

@@ -767,15 +767,11 @@ public function rename($path1, $path2) {
 				$this->changeLock($path2, ILockingProvider::LOCK_EXCLUSIVE, true);
 
 				if ($internalPath1 === '' and $mount1 instanceof MoveableMount) {
-					if ($this->isTargetAllowed($absolutePath2)) {
-						/**
-						 * @var \OC\Files\Mount\MountPoint | \OC\Files\Mount\MoveableMount $mount1
-						 */
-						$sourceMountPoint = $mount1->getMountPoint();
-						$result = $mount1->moveMount($absolutePath2);
+					$sourceMountPoint = $mount1->getMountPoint();
+					// can fail in case it's not allowed
+					$result = $mount1->moveMount($absolutePath2);
+					if ($result) {
 						$manager->moveMount($sourceMountPoint, $mount1->getMountPoint());
-					} else {
-						$result = false;
 					}
 					// moving a file/folder within the same mount point
 				} elseif ($storage1 === $storage2) {
@@ -1721,50 +1717,6 @@ private function assertPathLength($path) {
 		}
 	}
 
-	/**
-	 * check if it is allowed to move a mount point to a given target.
-	 * It is not allowed to move a mount point into a different mount point or
-	 * into an already shared folder
-	 *
-	 * @param string $target path
-	 * @return boolean
-	 */
-	private function isTargetAllowed($target) {
-
-		list($targetStorage, $targetInternalPath) = \OC\Files\Filesystem::resolvePath($target);
-		if (!$targetStorage->instanceOfStorage('\OCP\Files\IHomeStorage')) {
-			\OCP\Util::writeLog('files',
-				'It is not allowed to move one mount point into another one',
-				\OCP\Util::DEBUG);
-			return false;
-		}
-
-		// note: cannot use the view because the target is already locked
-		$fileId = (int)$targetStorage->getCache()->getId($targetInternalPath);
-		if ($fileId === -1) {
-			// target might not exist, need to check parent instead
-			$fileId = (int)$targetStorage->getCache()->getId(dirname($targetInternalPath));
-		}
-
-		// check if any of the parents were shared by the current owner (include collections)
-		$shares = \OCP\Share::getItemShared(
-			'folder',
-			$fileId,
-			\OCP\Share::FORMAT_NONE,
-			null,
-			true
-		);
-
-		if (count($shares) > 0) {
-			\OCP\Util::writeLog('files',
-				'It is not allowed to move one mount point into a shared folder',
-				\OCP\Util::DEBUG);
-			return false;
-		}
-
-		return true;
-	}
-
 	/**
 	 * Get a fileinfo object for files that are ignored in the cache (part files)
 	 *

lib/private/Share20/Manager.php

@@ -983,6 +983,24 @@ public function getShareById($id, $recipient = null) {
 	 * @return Share[]
 	 */
 	public function getSharesByPath(\OCP\Files\Node $path, $page=0, $perPage=50) {
+		$types = [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP];
+		$providers = [];
+		$results = [];
+
+		foreach ($types as $type) {
+			$providers[] = $this->factory->getProviderForType($type);
+		}
+
+		// in most cases it's the same provider
+		if ($providers[0] === $providers[1]) {
+			$providers = [$providers[0]];
+		}
+
+		foreach ($providers as $provider) {
+			$results = array_merge($results, $provider->getSharesByPath($path));
+		}
+
+		return $results;
 	}
 
 	/**