Skip to content

[stable26] fix(files): Also skip cross storage move with access control #45007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Apr 24, 2024
Merged

[stable26] fix(files): Also skip cross storage move with access control #45007

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8689e6e
fix(files): Also skip cross storage move with access control
nickvergessen Apr 17, 2024
404fe47
fix(CI): Suppress psalm UndefinedClass
nickvergessen Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(files): Also skip cross storage move with access control 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Apr 24, 2024
commit 8689e6eb07bad23bb433262525b3d7e6f7626f8c
2 changes: 2 additions & 0 deletions lib/private/Files/Storage/Local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,8 @@ private function canDoCrossStorageMove(IStorage $sourceStorage) {
// Instead, use the slower recursive copying in php from Common::copyFromStorage with
// more permissions checks.
&& !$sourceStorage->instanceOfStorage('OCA\GroupFolders\ACL\ACLStorageWrapper')
// Same for access control
&& !$sourceStorage->instanceOfStorage(\OCA\FilesAccessControl\StorageWrapper::class)
// when moving encrypted files we have to handle keys and the target might not be encrypted
&& !$sourceStorage->instanceOfStorage(Encryption::class);
}
Expand Down