mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

delete files right away in case of a encryption exception 

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2017-03-14 12:05:25 +01:00
parent 9ce32d9941
commit 79d362f4a6
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/files_trashbin/lib/Storage.php
View File

@ -28,6 +28,8 @@ namespace OCA\Files_Trashbin;
use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\Wrapper;
use OC\Files\View;
use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\ILogger;
use OCP\IUserManager;
class Storage extends Wrapper {
@ -55,15 +57,21 @@ class Storage extends Wrapper {
/** @var IUserManager */
private $userManager;
/** @var ILogger */
private $logger;
/**
* Storage constructor.
*
* @param array $parameters
* @param IUserManager|null $userManager
*/
public function __construct($parameters, IUserManager $userManager = null) {
public function __construct($parameters,
IUserManager $userManager = null,
ILogger $logger = null) {
$this->mountPoint = $parameters['mountPoint'];
$this->userManager = $userManager;
$this->logger = $logger;
parent::__construct($parameters);
}
@ -147,11 +155,20 @@ class Storage extends Wrapper {
* @return bool true if the operation succeeded, false otherwise
*/
public function unlink($path) {
if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
$result = $this->doDelete($path, 'unlink', true);
unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
} else {
$result = $this->doDelete($path, 'unlink');
try {
if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
$result = $this->doDelete($path, 'unlink', true);
unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
} else {
$result = $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");
$result = $this->storage->unlink($path);
}
return $result;
@ -251,7 +268,8 @@ class Storage extends Wrapper {
\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
return new \OCA\Files_Trashbin\Storage(
array('storage' => $storage, 'mountPoint' => $mountPoint),
\OC::$server->getUserManager()
\OC::$server->getUserManager(),
\OC::$server->getLogger()
);
}, 1);
}

5
apps/files_trashbin/tests/StorageTest.php
View File

@ -31,6 +31,7 @@ namespace OCA\Files_Trashbin\Tests;
use OC\Files\Storage\Temporary;
use OC\Files\Filesystem;
use OCP\ILogger;
/**
* Class Storage
@ -528,9 +529,11 @@ class StorageTest extends \Test\TestCase {
->disableOriginalConstructor()->getMock();
$userManager->expects($this->any())
->method('userExists')->willReturn($userExists);
$logger = $this->getMockBuilder(ILogger::class)->getMock();
$storage = new \OCA\Files_Trashbin\Storage(
['mountPoint' => $mountPoint, 'storage' => $tmpStorage],
$userManager
$userManager,
$logger
);
$this->assertSame($expected,