Merge pull request #29367 from nextcloud/backport/29362/stable21

[stable21] Fix security issues when copying groupfolder with advanced ACL
This commit is contained in:
Vincent Petry 2021-10-22 09:56:21 +02:00 committed by GitHub
commit a080c08d64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -525,7 +525,10 @@ class Local extends \OC\Files\Storage\Common {
* @return bool
*/
public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
if ($sourceStorage->instanceOfStorage(Local::class)) {
// 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')) {
if ($sourceStorage->instanceOfStorage(Jail::class)) {
/**
* @var \OC\Files\Storage\Wrapper\Jail $sourceStorage