Skip to content

Commit

Permalink
Merge pull request #45011 from nextcloud/backport/45010/stable22
Browse files Browse the repository at this point in the history
[stable22] fix(files): Also skip cross storage move with access control
  • Loading branch information
nickvergessen authored Apr 24, 2024
2 parents 295be5e + 0c2eecd commit 6ff74ca
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion lib/private/Files/Storage/Local.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6ff74ca

Please sign in to comment.