disable trasbin during the moveFromStorage fallback

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2021-02-10 16:43:24 +01:00 committed by backportbot[bot]
parent 9fea75d7d7
commit 59d157f1f2
2 changed files with 80 additions and 8 deletions

View File

@ -37,6 +37,7 @@ use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\Files\IRootFolder; use OCP\Files\IRootFolder;
use OCP\Files\Mount\IMountPoint; use OCP\Files\Mount\IMountPoint;
use OCP\Files\Node; use OCP\Files\Node;
use OCP\Files\Storage\IStorage;
use OCP\ILogger; use OCP\ILogger;
use OCP\IUserManager; use OCP\IUserManager;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@ -60,6 +61,8 @@ class Storage extends Wrapper {
/** @var ITrashManager */ /** @var ITrashManager */
private $trashManager; private $trashManager;
private $trashEnabled = true;
/** /**
* Storage constructor. * Storage constructor.
* *
@ -95,14 +98,18 @@ class Storage extends Wrapper {
* @return bool true if the operation succeeded, false otherwise * @return bool true if the operation succeeded, false otherwise
*/ */
public function unlink($path) { public function unlink($path) {
try { if ($this->trashEnabled) {
return $this->doDelete($path, 'unlink'); try {
} catch (GenericEncryptionException $e) { return $this->doDelete($path, 'unlink');
// in case of a encryption exception we delete the file right away } catch (GenericEncryptionException $e) {
$this->logger->info( // in case of a encryption exception we delete the file right away
"Can't move file " . $path . $this->logger->info(
" to the trash bin, therefore it was deleted right away"); "Can't move file " . $path .
" to the trash bin, therefore it was deleted right away");
return $this->storage->unlink($path);
}
} else {
return $this->storage->unlink($path); return $this->storage->unlink($path);
} }
} }
@ -115,7 +122,11 @@ class Storage extends Wrapper {
* @return bool true if the operation succeeded, false otherwise * @return bool true if the operation succeeded, false otherwise
*/ */
public function rmdir($path) { public function rmdir($path) {
return $this->doDelete($path, 'rmdir'); if ($this->trashEnabled) {
return $this->doDelete($path, 'rmdir');
} else {
return $this->storage->rmdir($path);
}
} }
/** /**
@ -216,4 +227,36 @@ class Storage extends Wrapper {
public function getMountPoint() { public function getMountPoint() {
return $this->mountPoint; return $this->mountPoint;
} }
public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
$sourceIsTrashbin = $sourceStorage->instanceOfStorage(Storage::class);
try {
// the fallback for moving between storage involves a copy+delete
// we don't want to trigger the trashbin when doing the delete
if ($sourceIsTrashbin) {
/** @var Storage $sourceStorage */
$sourceStorage->disableTrash();
}
$result = $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
if ($sourceIsTrashbin) {
/** @var Storage $sourceStorage */
$sourceStorage->enableTrash();
}
return $result;
} catch (\Exception $e) {
if ($sourceIsTrashbin) {
/** @var Storage $sourceStorage */
$sourceStorage->enableTrash();
}
throw $e;
}
}
protected function disableTrash() {
$this->trashEnabled = false;
}
protected function enableTrash() {
$this->trashEnabled = true;
}
} }

View File

@ -33,6 +33,7 @@
namespace OCA\Files_Trashbin\Tests; namespace OCA\Files_Trashbin\Tests;
use OC\Files\Filesystem; use OC\Files\Filesystem;
use OC\Files\Storage\Common;
use OC\Files\Storage\Temporary; use OC\Files\Storage\Temporary;
use OCA\Files_Trashbin\AppInfo\Application; use OCA\Files_Trashbin\AppInfo\Application;
use OCA\Files_Trashbin\Events\MoveToTrashEvent; use OCA\Files_Trashbin\Events\MoveToTrashEvent;
@ -44,11 +45,23 @@ use OCP\Files\Cache\ICache;
use OCP\Files\Folder; use OCP\Files\Folder;
use OCP\Files\IRootFolder; use OCP\Files\IRootFolder;
use OCP\Files\Node; use OCP\Files\Node;
use OCP\Files\Storage\IStorage;
use OCP\ILogger; use OCP\ILogger;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\Lock\ILockingProvider; use OCP\Lock\ILockingProvider;
use OCP\Share\IShare; use OCP\Share\IShare;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Test\Traits\MountProviderTrait;
class TemporaryNoCross extends Temporary {
public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = null) {
return Common::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime);
}
public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
return Common::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
}
}
/** /**
* Class Storage * Class Storage
@ -58,6 +71,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
* @package OCA\Files_Trashbin\Tests * @package OCA\Files_Trashbin\Tests
*/ */
class StorageTest extends \Test\TestCase { class StorageTest extends \Test\TestCase {
use MountProviderTrait;
/** /**
* @var string * @var string
*/ */
@ -645,4 +660,18 @@ class StorageTest extends \Test\TestCase {
$this->assertEquals('foo', $this->rootView->file_get_contents($this->user . '/files_trashbin/files/test.txt.d1000')); $this->assertEquals('foo', $this->rootView->file_get_contents($this->user . '/files_trashbin/files/test.txt.d1000'));
$this->assertEquals('bar', $this->rootView->file_get_contents($this->user . '/files_trashbin/files/test.txt.d1001')); $this->assertEquals('bar', $this->rootView->file_get_contents($this->user . '/files_trashbin/files/test.txt.d1001'));
} }
public function testMoveFromStoragePreserveFileId() {
$this->userView->file_put_contents('test.txt', 'foo');
$fileId = $this->userView->getFileInfo('test.txt')->getId();
$externalStorage = new TemporaryNoCross([]);
$externalStorage->getScanner()->scan('');
Filesystem::mount($externalStorage, [], "/" . $this->user . "/files/storage");
$this->assertTrue($this->userView->rename('test.txt', 'storage/test.txt'));
$this->assertTrue($externalStorage->file_exists('test.txt'));
$this->assertEquals($fileId, $this->userView->getFileInfo('storage/test.txt')->getId());
}
} }