67f1534e0f
In the case of cross-storage delete, the files are copied to the trash, then deleted. The final delete on the source storage would still reach the trash wrapper. This fix makes forwards that second call to the wrapped storage to make the final delete work. It fixes the issue with remote shares, local shares and external storage. Also, it uses a new function "renameRecursive" that renames the files and preserves the mtimes (like "copy_recursive" did in the past))
340 lines
12 KiB
PHP
Executable file
340 lines
12 KiB
PHP
Executable file
<?php
|
|
/**
|
|
* ownCloud
|
|
*
|
|
* @author Florin Peter
|
|
* @copyright 2013 Florin Peter <owncloud@florin-peter.de>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
|
* License as published by the Free Software Foundation; either
|
|
* version 3 of the License, or any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
namespace OCA\Files_Encryption\Tests;
|
|
|
|
/**
|
|
* Class Trashbin
|
|
* this class provide basic trashbin app tests
|
|
*/
|
|
class Trashbin extends TestCase {
|
|
|
|
const TEST_ENCRYPTION_TRASHBIN_USER1 = "test-trashbin-user1";
|
|
|
|
public $userId;
|
|
public $pass;
|
|
/**
|
|
* @var \OC\Files\View
|
|
*/
|
|
public $view;
|
|
public $dataShort;
|
|
public $stateFilesTrashbin;
|
|
public $folder1;
|
|
public $subfolder;
|
|
public $subsubfolder;
|
|
|
|
public static function setUpBeforeClass() {
|
|
parent::setUpBeforeClass();
|
|
|
|
// trashbin hooks
|
|
\OCA\Files_Trashbin\Trashbin::registerHooks();
|
|
|
|
// create test user
|
|
self::loginHelper(self::TEST_ENCRYPTION_TRASHBIN_USER1, true);
|
|
}
|
|
|
|
protected function setUp() {
|
|
parent::setUp();
|
|
|
|
// set user id
|
|
\OC_User::setUserId(self::TEST_ENCRYPTION_TRASHBIN_USER1);
|
|
$this->userId = self::TEST_ENCRYPTION_TRASHBIN_USER1;
|
|
$this->pass = self::TEST_ENCRYPTION_TRASHBIN_USER1;
|
|
|
|
// init filesystem view
|
|
$this->view = new \OC\Files\View('/');
|
|
|
|
// init short data
|
|
$this->dataShort = 'hats';
|
|
|
|
$this->folder1 = '/folder1';
|
|
$this->subfolder = '/subfolder1';
|
|
$this->subsubfolder = '/subsubfolder1';
|
|
|
|
// remember files_trashbin state
|
|
$this->stateFilesTrashbin = \OC_App::isEnabled('files_trashbin');
|
|
|
|
// we want to tests with app files_trashbin enabled
|
|
\OC_App::enable('files_trashbin');
|
|
}
|
|
|
|
protected function tearDown() {
|
|
// reset app files_trashbin
|
|
if ($this->stateFilesTrashbin) {
|
|
\OC_App::enable('files_trashbin');
|
|
}
|
|
else {
|
|
\OC_App::disable('files_trashbin');
|
|
}
|
|
|
|
parent::tearDown();
|
|
}
|
|
|
|
public static function tearDownAfterClass() {
|
|
// cleanup test user
|
|
\OC_User::deleteUser(self::TEST_ENCRYPTION_TRASHBIN_USER1);
|
|
|
|
\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
|
|
|
|
parent::tearDownAfterClass();
|
|
}
|
|
|
|
/**
|
|
* @medium
|
|
* test delete file
|
|
*/
|
|
function testDeleteFile() {
|
|
|
|
// generate filename
|
|
$filename = 'tmp-' . $this->getUniqueID() . '.txt';
|
|
$filename2 = $filename . '.backup'; // a second file with similar name
|
|
|
|
// save file with content
|
|
$cryptedFile = file_put_contents('crypt:///' .self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort);
|
|
$cryptedFile2 = file_put_contents('crypt:///' .self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename2, $this->dataShort);
|
|
|
|
// test that data was successfully written
|
|
$this->assertTrue(is_int($cryptedFile));
|
|
$this->assertTrue(is_int($cryptedFile2));
|
|
|
|
// check if key for admin exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename2 . '/fileKey'));
|
|
|
|
// check if share key for admin exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename2 . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
|
|
// delete first file
|
|
\OC\Files\Filesystem::unlink($filename);
|
|
|
|
// check if file not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
|
|
|
|
// check if key for admin not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
|
|
|
|
// check if share key for admin not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
|
|
// check that second file still exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename2));
|
|
|
|
// check that key for second file still exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename2 . '/fileKey'));
|
|
|
|
// check that share key for second file still exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename2 . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
|
|
// get files
|
|
$trashFiles = \OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_ENCRYPTION_TRASHBIN_USER1);
|
|
|
|
// find created file with timestamp
|
|
$timestamp = null;
|
|
foreach ($trashFiles as $file) {
|
|
if ($file['name'] === $filename) {
|
|
$timestamp = $file['mtime'];
|
|
break;
|
|
}
|
|
}
|
|
|
|
// check if we found the file we created
|
|
$this->assertNotNull($timestamp);
|
|
|
|
$this->assertTrue($this->view->is_dir('/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename . '.d' . $timestamp));
|
|
|
|
// check if key for admin not exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename . '.d' . $timestamp . '/fileKey'));
|
|
|
|
// check if share key for admin not exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename
|
|
. '.d' . $timestamp . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
}
|
|
|
|
/**
|
|
* @medium
|
|
* test restore file
|
|
*/
|
|
function testRestoreFile() {
|
|
// generate filename
|
|
$filename = 'tmp-' . $this->getUniqueID() . '.txt';
|
|
$filename2 = $filename . '.backup'; // a second file with similar name
|
|
|
|
// save file with content
|
|
file_put_contents('crypt:///' . self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort);
|
|
file_put_contents('crypt:///' . self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename2, $this->dataShort);
|
|
|
|
// delete both files
|
|
\OC\Files\Filesystem::unlink($filename);
|
|
\OC\Files\Filesystem::unlink($filename2);
|
|
|
|
$trashFiles = \OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_ENCRYPTION_TRASHBIN_USER1);
|
|
|
|
// find created file with timestamp
|
|
$timestamp = null;
|
|
foreach ($trashFiles as $file) {
|
|
if ($file['name'] === $filename) {
|
|
$timestamp = $file['mtime'];
|
|
break;
|
|
}
|
|
}
|
|
|
|
// make sure that we have a timestamp
|
|
$this->assertNotNull($timestamp);
|
|
|
|
// before calling the restore operation the keys shouldn't be there
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
|
|
// restore first file
|
|
$this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename . '.d' . $timestamp, $filename, $timestamp));
|
|
|
|
// check if file exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
|
|
|
|
// check if key for admin exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
|
|
|
|
// check if share key for admin exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
|
|
// check that second file was NOT restored
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename2));
|
|
|
|
// check if key for admin exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename2 . '/fileKey'));
|
|
|
|
// check if share key for admin exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename2 . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
}
|
|
|
|
/**
|
|
* @medium
|
|
* test delete file forever
|
|
*/
|
|
function testPermanentDeleteFile() {
|
|
|
|
// generate filename
|
|
$filename = 'tmp-' . $this->getUniqueID() . '.txt';
|
|
|
|
// save file with content
|
|
$cryptedFile = file_put_contents('crypt:///' .$this->userId. '/files/' . $filename, $this->dataShort);
|
|
|
|
// test that data was successfully written
|
|
$this->assertTrue(is_int($cryptedFile));
|
|
|
|
// check if key for admin exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
|
|
|
|
// check if share key for admin exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
|
|
// delete file
|
|
\OC\Files\Filesystem::unlink($filename);
|
|
|
|
// check if file not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
|
|
|
|
// check if key for admin not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/'
|
|
. $filename . '.key'));
|
|
|
|
// check if share key for admin not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
|
|
. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
|
|
// find created file with timestamp
|
|
$query = \OC_DB::prepare('SELECT `timestamp`,`type` FROM `*PREFIX*files_trash`'
|
|
. ' WHERE `id`=?');
|
|
$result = $query->execute(array($filename))->fetchRow();
|
|
|
|
$this->assertTrue(is_array($result));
|
|
|
|
// build suffix
|
|
$trashFileSuffix = 'd' . $result['timestamp'];
|
|
|
|
// check if key for admin exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename
|
|
. '.' . $trashFileSuffix . '/fileKey'));
|
|
|
|
// check if share key for admin exists
|
|
$this->assertTrue($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/'
|
|
. $filename . '.' . $trashFileSuffix . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
|
|
// get timestamp from file
|
|
$timestamp = str_replace('d', '', $trashFileSuffix);
|
|
|
|
// delete file forever
|
|
$this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $this->userId, $timestamp));
|
|
|
|
// check if key for admin not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/' . $filename . '.'
|
|
. $trashFileSuffix));
|
|
|
|
// check if key for admin not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename
|
|
. '.' . $trashFileSuffix . '/fileKey'));
|
|
|
|
// check if share key for admin not exists
|
|
$this->assertFalse($this->view->file_exists(
|
|
'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename
|
|
. '.' . $trashFileSuffix . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
|
|
}
|
|
|
|
}
|