Merge pull request #2792 from x7airworker/master

Fixed an ACL bug which disallowed renaming of files in certain configurations
nextcloud · Mar 11, 2024 · 7544744 · 7544744
2 parents eff78cb + 6f8b431
commit 7544744
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/ACL/ACLStorageWrapper.php b/lib/ACL/ACLStorageWrapper.php
@@ -94,7 +94,12 @@ public function rename($source, $target) {
 		if ($sourceParent === '.') {
 			$sourceParent = '';
 		}
-		return $this->checkPermissions($sourceParent, Constants::PERMISSION_DELETE) &&
+		$targetParent = dirname($target);
+		if ($targetParent === '.') {
+			$targetParent = '';
+		}
+		return  ($sourceParent === $targetParent ||
+			$this->checkPermissions($sourceParent, Constants::PERMISSION_DELETE)) &&
 			$this->checkPermissions($source, Constants::PERMISSION_UPDATE & Constants::PERMISSION_READ) &&
 			$this->checkPermissions($target, $permissions) &&
 			parent::rename($source, $target);