Merge pull request #45014 from nextcloud/forbid-moving-subfolder

fix: forbid moving a folder into a subfolder of itself
nextcloud · May 27, 2024 · d87c232 · d87c232
2 parents b8aef38 + 66d36bf
commit d87c232
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
@@ -20,6 +20,7 @@
 use OCP\Files\ConnectionLostException;
 use OCP\Files\EmptyFileNameException;
 use OCP\Files\FileNameTooLongException;
+use OCP\Files\ForbiddenException;
 use OCP\Files\InvalidCharacterInPathException;
 use OCP\Files\InvalidDirectoryException;
 use OCP\Files\InvalidPathException;
@@ -694,6 +695,11 @@ public function deleteAll($directory) {
 	public function rename($source, $target) {
 		$absolutePath1 = Filesystem::normalizePath($this->getAbsolutePath($source));
 		$absolutePath2 = Filesystem::normalizePath($this->getAbsolutePath($target));
+
+		if (str_starts_with($absolutePath2, $absolutePath1 . '/')) {
+			throw new ForbiddenException("Moving a folder into a child folder is forbidden", false);
+		}
+
 		$targetParts = explode('/', $absolutePath2);
 		$targetUser = $targetParts[1] ?? null;
 		$result = false;