Skip to content

fix: add moveFromStorage for objectstorage to fix transfer ownership on s3 #32781

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

Closed
unteem wants to merge 1 commit into from
Closed

fix: add moveFromStorage for objectstorage to fix transfer ownership on s3 #32781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions lib/private/Files/ObjectStore/ObjectStoreStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,4 +611,17 @@ private function copyFile(ICacheEntry $sourceEntry, string $to) {
throw $e;
}
}

public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
while ($sourceStorage->instanceOfStorage(Jail::class)) {
Copy link
Author

@unteem unteem Jun 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea if this is needed nor what it does.
It was in moveFromStorage function in Common.php and Local.php so I left it here

Check failure

Code scanning / Psalm

UndefinedClass

Class, interface or enum named OC\Files\ObjectStore\Jail does not exist

Check failure

Code scanning / Psalm

InvalidArgument

Argument 1 of OCP\Files\Storage\IStorage::instanceOfStorage expects class-string<OCP\Files\Storage\IStorage>, OC\Files\ObjectStore\Jail::class provided
/**
* @var Jail $sourceStorage
*/
$sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath);

Check failure

Code scanning / Psalm

UndefinedDocblockClass

Docblock-defined class, interface or enum named OC\Files\ObjectStore\Jail does not exist

Check failure

Code scanning / Psalm

UndefinedDocblockClass

Docblock-defined class, interface or enum named OC\Files\ObjectStore\Jail does not exist
$sourceStorage = $sourceStorage->getUnjailedStorage();

Check failure

Code scanning / Psalm

UndefinedDocblockClass

Docblock-defined class, interface or enum named OC\Files\ObjectStore\Jail does not exist
}

$this->getCache()->moveFromCache($sourceStorage->getCache(), $sourceInternalPath, $targetInternalPath);
return true;
}
}