Skip to content
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

disable trasbin during the moveFromStorage fallback #25568

Merged
merged 1 commit into from
Mar 2, 2021
Merged

disable trasbin during the moveFromStorage fallback #25568

Show file tree
Hide file tree
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
59 changes: 51 additions & 8 deletions apps/files_trashbin/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
use OCP\Files\IRootFolder;
use OCP\Files\Mount\IMountPoint;
use OCP\Files\Node;
use OCP\Files\Storage\IStorage;
use OCP\ILogger;
use OCP\IUserManager;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
Expand All @@ -60,6 +61,8 @@ class Storage extends Wrapper {
/** @var ITrashManager */
private $trashManager;

private $trashEnabled = true;

/**
* Storage constructor.
*
Expand Down Expand Up @@ -95,14 +98,18 @@ public function __construct(
* @return bool true if the operation succeeded, false otherwise
*/
public function unlink($path) {
try {
return $this->doDelete($path, 'unlink');
} catch (GenericEncryptionException $e) {
// in case of a encryption exception we delete the file right away
$this->logger->info(
"Can't move file " . $path .
" to the trash bin, therefore it was deleted right away");
if ($this->trashEnabled) {
try {
return $this->doDelete($path, 'unlink');
} catch (GenericEncryptionException $e) {
// in case of a encryption exception we delete the file right away
$this->logger->info(
"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);
}
}
Expand All @@ -115,7 +122,11 @@ public function unlink($path) {
* @return bool true if the operation succeeded, false otherwise
*/
public function rmdir($path) {
return $this->doDelete($path, 'rmdir');
if ($this->trashEnabled) {
return $this->doDelete($path, 'rmdir');
} else {
return $this->storage->rmdir($path);
}
}

/**
Expand Down Expand Up @@ -216,4 +227,36 @@ public static function setupStorage() {
public function getMountPoint() {
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;
}
}
29 changes: 29 additions & 0 deletions apps/files_trashbin/tests/StorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
namespace OCA\Files_Trashbin\Tests;

use OC\Files\Filesystem;
use OC\Files\Storage\Common;
use OC\Files\Storage\Temporary;
use OCA\Files_Trashbin\AppInfo\Application;
use OCA\Files_Trashbin\Events\MoveToTrashEvent;
Expand All @@ -44,11 +45,23 @@
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\Storage\IStorage;
use OCP\ILogger;
use OCP\IUserManager;
use OCP\Lock\ILockingProvider;
use OCP\Share\IShare;
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
Expand All @@ -58,6 +71,8 @@
* @package OCA\Files_Trashbin\Tests
*/
class StorageTest extends \Test\TestCase {
use MountProviderTrait;

/**
* @var string
*/
Expand Down Expand Up @@ -645,4 +660,18 @@ public function testTrashbinCollision() {
$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'));
}

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());
}
}