fix: add moveFromStorage for objectstorage to fix transfer ownership on s3 #32781
Conversation
Signed-off-by: unteem <timothee@indie.host>
unteem
force-pushed
the
fix-transferownership-s3
branch
from
67eee25
to
5c41417
Compare
| @@ -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)) { | |||
There was a problem hiding this comment.
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
szaimen
requested review from
icewind1991,
a team,
PVince81 and
blizzz
and removed request for
a team
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -611,4 +611,17 @@ | |||
| throw $e; | |||
| } | |||
| } | |||
|
|
|||
| public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) { | |||
| while ($sourceStorage->instanceOfStorage(Jail::class)) { | |||
Check failure
Code scanning / Psalm
UndefinedClass
| @@ -611,4 +611,17 @@ | |||
| throw $e; | |||
| } | |||
| } | |||
|
|
|||
| public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) { | |||
| while ($sourceStorage->instanceOfStorage(Jail::class)) { | |||
Check failure
Code scanning / Psalm
InvalidArgument
| /** | ||
| * @var Jail $sourceStorage | ||
| */ | ||
| $sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath); |
Check failure
Code scanning / Psalm
UndefinedDocblockClass
| /** | ||
| * @var Jail $sourceStorage | ||
| */ | ||
| $sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath); |
Check failure
Code scanning / Psalm
UndefinedDocblockClass
| * @var Jail $sourceStorage | ||
| */ | ||
| $sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath); | ||
| $sourceStorage = $sourceStorage->getUnjailedStorage(); |
Check failure
Code scanning / Psalm
UndefinedDocblockClass
|
@icewind1991 please validate this approach |
skjnldsv
added
2. developing
|
As there is no feedback since a while I will close this ticket. Thanks for the interest in Nextcloud and the effort put into this! 🙇 |
This PR fixes #25693 and #31870
When transferring ownership on s3 primary storage it was doing a copy and delete leading to shares being linked to non-existing files and failing to transfer
Implementing
moveFromStorageinlib/private/Files/ObjectStore/ObjectStoreStorage.phpfixes it.It doesn't fix the
isSameStorage(server/lib/private/Files/Storage/Common.php
Line 678 in e56a072
renamewhich only works for renaming a folder/files in the same user storage.