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

Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash 

also encrypt files in trash bin
This commit is contained in:
Vincent Petry 2015-05-18 14:59:34 +02:00
parent 85f500f070 7d492fefae
commit 86cf8e1f68
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/encryption/lib/crypto/encryption.php
View File

@ -330,7 +330,7 @@ class Encryption implements IEncryptionModule {
*/
public function shouldEncrypt($path) {
$parts = explode('/', $path);
if (count($parts) < 3) {
if (count($parts) < 4) {
return false;
}
@ -340,6 +340,9 @@ class Encryption implements IEncryptionModule {
if ($parts[2] == 'files_versions') {
return true;
}
if ($parts[2] == 'files_trashbin') {
return true;
}
return false;
}

25
apps/encryption/tests/lib/crypto/encryptionTest.php
View File

@ -220,4 +220,29 @@ class EncryptionTest extends TestCase {
);
}
/**
* by default the encryption module should encrypt regular files, files in
* files_versions and files in files_trashbin
*
* @dataProvider dataTestShouldEncrypt
*/
public function testShouldEncrypt($path, $expected) {
$this->assertSame($expected,
$this->instance->shouldEncrypt($path)
);
}
public function dataTestShouldEncrypt() {
return array(
array('/user1/files/foo.txt', true),
array('/user1/files_versions/foo.txt', true),
array('/user1/files_trashbin/foo.txt', true),
array('/user1/some_folder/foo.txt', false),
array('/user1/foo.txt', false),
array('/user1/files', false),
array('/user1/files_trashbin', false),
array('/user1/files_versions', false),
);
}
}