Merge pull request #45012 from nextcloud/backport/45010/stable21

[stable21] fix(files): Also skip cross storage move with access control
nextcloud · Apr 24, 2024 · 11a19ad · 11a19ad
2 parents 646cba4 + 2986019
commit 11a19ad
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
@@ -528,7 +528,10 @@ public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
 		// Don't treat ACLStorageWrapper like local storage where copy can be done directly.
 		// Instead use the slower recursive copying in php from Common::copyFromStorage with
 		// more permissions checks.
-		if ($sourceStorage->instanceOfStorage(Local::class) && !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper')) {
+		/** @psalm-suppress UndefinedClass */
+		if ($sourceStorage->instanceOfStorage(Local::class)
+			&& !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper')
+			&& !$sourceStorage->instanceOfStorage(\OCA\FilesAccessControl\StorageWrapper::class)) {
 			if ($sourceStorage->instanceOfStorage(Jail::class)) {
 				/**
 				 * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage