From 2990b0e07e418577d55368c21200ada86c381b51 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 23 Apr 2015 16:48:11 +0200 Subject: update share keys if a file is moved to a shared folder --- tests/lib/encryption/updatetest.php | 129 +++++++++++++++++++++++++ tests/lib/encryption/utiltest.php | 21 ++++ tests/lib/files/storage/wrapper/encryption.php | 59 +++++++++-- 3 files changed, 203 insertions(+), 6 deletions(-) create mode 100644 tests/lib/encryption/updatetest.php (limited to 'tests') diff --git a/tests/lib/encryption/updatetest.php b/tests/lib/encryption/updatetest.php new file mode 100644 index 00000000000..28bb0031308 --- /dev/null +++ b/tests/lib/encryption/updatetest.php @@ -0,0 +1,129 @@ + + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program 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, version 3, + * along with this program. If not, see + * + */ + + +namespace Test\Encryption; + + +use OC\Encryption\Update; +use Test\TestCase; + +class UpdateTest extends TestCase { + + /** @var \OC\Encryption\Update */ + private $update; + + /** @var string */ + private $uid; + + /** @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject */ + private $view; + + /** @var \OC\Encryption\Util | \PHPUnit_Framework_MockObject_MockObject */ + private $util; + + /** @var \OC\Files\Mount\Manager | \PHPUnit_Framework_MockObject_MockObject */ + private $mountManager; + + /** @var \OC\Encryption\Manager | \PHPUnit_Framework_MockObject_MockObject */ + private $encryptionManager; + + /** @var \OCP\Encryption\IEncryptionModule | \PHPUnit_Framework_MockObject_MockObject */ + private $encryptionModule; + + /** @var \OC\Encryption\File | \PHPUnit_Framework_MockObject_MockObject */ + private $fileHelper; + + public function setUp() { + parent::setUp(); + + $this->view = $this->getMockBuilder('\OC\Files\View') + ->disableOriginalConstructor()->getMock(); + $this->util = $this->getMockBuilder('\OC\Encryption\Util') + ->disableOriginalConstructor()->getMock(); + $this->mountManager = $this->getMockBuilder('\OC\Files\Mount\Manager') + ->disableOriginalConstructor()->getMock(); + $this->encryptionManager = $this->getMockBuilder('\OC\Encryption\Manager') + ->disableOriginalConstructor()->getMock(); + $this->fileHelper = $this->getMockBuilder('\OC\Encryption\File') + ->disableOriginalConstructor()->getMock(); + $this->encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') + ->disableOriginalConstructor()->getMock(); + + $this->encryptionManager->expects($this->once()) + ->method('getDefaultEncryptionModule') + ->willReturn($this->encryptionModule); + + $this->uid = 'testUser1'; + + $this->update = new Update( + $this->view, + $this->util, + $this->mountManager, + $this->encryptionManager, + $this->fileHelper, + $this->uid); + } + + /** + * @dataProvider dataTestUpdate + * + * @param string $path + * @param boolean $isDir + * @param array $allFiles + * @param integer $numberOfFiles + */ + public function testUpdate($path, $isDir, $allFiles, $numberOfFiles) { + + $this->view->expects($this->once()) + ->method('is_dir') + ->willReturn($isDir); + + if($isDir) { + $this->util->expects($this->once()) + ->method('getAllFiles') + ->willReturn($allFiles); + } + + $this->fileHelper->expects($this->exactly($numberOfFiles)) + ->method('getAccessList') + ->willReturn(['users' => [], 'public' => false]); + + $this->encryptionModule->expects($this->exactly($numberOfFiles)) + ->method('update') + ->willReturn(true); + + $this->update->update($path); + } + + /** + * data provider for testUpdate() + * + * @return array + */ + public function dataTestUpdate() { + return array( + array('/user/files/foo', true, ['/user/files/foo/file1.txt', '/user/files/foo/file1.txt'], 2), + array('/user/files/test.txt', false, [], 1), + ); + } + +} diff --git a/tests/lib/encryption/utiltest.php b/tests/lib/encryption/utiltest.php index dc6205e16fd..7de57043920 100644 --- a/tests/lib/encryption/utiltest.php +++ b/tests/lib/encryption/utiltest.php @@ -152,4 +152,25 @@ class UtilTest extends TestCase { return false; } + /** + * @dataProvider dataTestIsFile + */ + public function testIsFile($path, $expected) { + $this->assertSame($expected, + $this->util->isFile($path) + ); + } + + public function dataTestIsFile() { + return array( + array('/user/files/test.txt', true), + array('/user/files', true), + array('/user/files_versions/test.txt', false), + array('/user/foo/files/test.txt', false), + array('/files/foo/files/test.txt', false), + array('/user', false), + array('/user/test.txt', false), + ); + } + } diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index 1d776555503..12309c5ac44 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -12,11 +12,26 @@ class Encryption extends \Test\Files\Storage\Storage { */ private $sourceStorage; + /** + * @var \OC\Files\Storage\Wrapper\Encryption + */ + protected $instance; + /** * @var \OC\Encryption\Keys\Storage | \PHPUnit_Framework_MockObject_MockObject */ private $keyStore; + /** + * @var \OC\Encryption\Util | \PHPUnit_Framework_MockObject_MockObject + */ + private $util; + + /** + * @var \OC\Encryption\Update | \PHPUnit_Framework_MockObject_MockObject + */ + private $update; + public function setUp() { parent::setUp(); @@ -43,8 +58,8 @@ class Encryption extends \Test\Files\Storage\Storage { ->disableOriginalConstructor() ->getMock(); - $util = $this->getMock('\OC\Encryption\Util', ['getUidAndFilename'], [new View(), new \OC\User\Manager(), $groupManager, $config]); - $util->expects($this->any()) + $this->util = $this->getMock('\OC\Encryption\Util', ['getUidAndFilename', 'isFile'], [new View(), new \OC\User\Manager(), $groupManager, $config]); + $this->util->expects($this->any()) ->method('getUidAndFilename') ->willReturnCallback(function ($path) { return ['user1', $path]; @@ -61,6 +76,8 @@ class Encryption extends \Test\Files\Storage\Storage { $this->sourceStorage = new Temporary(array()); $this->keyStore = $this->getMockBuilder('\OC\Encryption\Keys\Storage') ->disableOriginalConstructor()->getMock(); + $this->update = $this->getMockBuilder('\OC\Encryption\Update') + ->disableOriginalConstructor()->getMock(); $mount = $this->getMockBuilder('\OC\Files\Mount\MountPoint') ->disableOriginalConstructor() ->setMethods(['getOption']) @@ -72,7 +89,7 @@ class Encryption extends \Test\Files\Storage\Storage { 'mountPoint' => '/', 'mount' => $mount ], - $encryptionManager, $util, $logger, $file, null, $this->keyStore + $encryptionManager, $this->util, $logger, $file, null, $this->keyStore, $this->update ); } @@ -97,11 +114,41 @@ class Encryption extends \Test\Files\Storage\Storage { return $encryptionModule; } - public function testRename() { + /** + * @dataProvider dataTestRename + * + * @param string $source + * @param string $target + * @param boolean $shouldUpdate + */ + public function testRename($source, $target, $shouldUpdate) { $this->keyStore ->expects($this->once()) ->method('renameKeys'); - $this->instance->mkdir('folder'); - $this->instance->rename('folder', 'flodder'); + $this->util->expects($this->any()) + ->method('isFile')->willReturn(true); + if ($shouldUpdate) { + $this->update->expects($this->once()) + ->method('update'); + } else { + $this->update->expects($this->never()) + ->method('update'); + } + + $this->instance->mkdir($source); + $this->instance->mkdir(dirname($target)); + $this->instance->rename($source, $target); + } + + /** + * data provider for testRename() + * + * @return array + */ + public function dataTestRename() { + return array( + array('source', 'target', false), + array('source', '/subFolder/target', true), + ); } } -- cgit v1.2.3 From 2646bccb83d06f575722e3fb8c5bd87ed42775c9 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 23 Apr 2015 17:06:55 +0200 Subject: update share keys if file gets copied --- lib/private/files/storage/wrapper/encryption.php | 6 +- tests/lib/files/storage/wrapper/encryption.php | 83 +++++++++++++++++++----- 2 files changed, 70 insertions(+), 19 deletions(-) (limited to 'tests') diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 089da941756..0f6096adb76 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -256,9 +256,9 @@ class Encryption extends Wrapper { $result = $this->storage->copy($path1, $path2); if ($result) { $target = $this->getFullPath($path2); - $encryptionModule = $this->getEncryptionModule($path2); - if ($encryptionModule) { - $this->keyStorage->copyKeys($source, $target); + $this->keyStorage->copyKeys($source, $target); + if (dirname($source) !== dirname($target) && $this->util->isFile($target)) { + $this->update->update($target); } } diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index 12309c5ac44..f22f02f568c 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -27,6 +27,18 @@ class Encryption extends \Test\Files\Storage\Storage { */ private $util; + + /** + * @var \OC\Encryption\Manager | \PHPUnit_Framework_MockObject_MockObject + */ + private $encryptionManager; + + /** + * @var \OCP\Encryption\IEncryptionModule | \PHPUnit_Framework_MockObject_MockObject + */ + private $encryptionModule; + + /** * @var \OC\Encryption\Update | \PHPUnit_Framework_MockObject_MockObject */ @@ -37,17 +49,17 @@ class Encryption extends \Test\Files\Storage\Storage { parent::setUp(); $mockModule = $this->buildMockModule(); - $encryptionManager = $this->getMockBuilder('\OC\Encryption\Manager') + $this->encryptionManager = $this->getMockBuilder('\OC\Encryption\Manager') ->disableOriginalConstructor() ->setMethods(['getDefaultEncryptionModule', 'getEncryptionModule', 'isEnabled']) ->getMock(); - $encryptionManager->expects($this->any()) + $this->encryptionManager->expects($this->any()) ->method('getDefaultEncryptionModule') ->willReturn($mockModule); - $encryptionManager->expects($this->any()) + $this->encryptionManager->expects($this->any()) ->method('getEncryptionModule') ->willReturn($mockModule); - $encryptionManager->expects($this->any()) + $this->encryptionManager->expects($this->any()) ->method('isEnabled') ->willReturn(true); @@ -89,7 +101,7 @@ class Encryption extends \Test\Files\Storage\Storage { 'mountPoint' => '/', 'mount' => $mount ], - $encryptionManager, $this->util, $logger, $file, null, $this->keyStore, $this->update + $this->encryptionManager, $this->util, $logger, $file, null, $this->keyStore, $this->update ); } @@ -97,21 +109,21 @@ class Encryption extends \Test\Files\Storage\Storage { * @return \PHPUnit_Framework_MockObject_MockObject */ protected function buildMockModule() { - $encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') + $this->encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') ->disableOriginalConstructor() ->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize']) ->getMock(); - $encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE'); - $encryptionModule->expects($this->any())->method('getDisplayName')->willReturn('Unit test module'); - $encryptionModule->expects($this->any())->method('begin')->willReturn([]); - $encryptionModule->expects($this->any())->method('end')->willReturn(''); - $encryptionModule->expects($this->any())->method('encrypt')->willReturnArgument(0); - $encryptionModule->expects($this->any())->method('decrypt')->willReturnArgument(0); - $encryptionModule->expects($this->any())->method('update')->willReturn(true); - $encryptionModule->expects($this->any())->method('shouldEncrypt')->willReturn(true); - $encryptionModule->expects($this->any())->method('getUnencryptedBlockSize')->willReturn(8192); - return $encryptionModule; + $this->encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE'); + $this->encryptionModule->expects($this->any())->method('getDisplayName')->willReturn('Unit test module'); + $this->encryptionModule->expects($this->any())->method('begin')->willReturn([]); + $this->encryptionModule->expects($this->any())->method('end')->willReturn(''); + $this->encryptionModule->expects($this->any())->method('encrypt')->willReturnArgument(0); + $this->encryptionModule->expects($this->any())->method('decrypt')->willReturnArgument(0); + $this->encryptionModule->expects($this->any())->method('update')->willReturn(true); + $this->encryptionModule->expects($this->any())->method('shouldEncrypt')->willReturn(true); + $this->encryptionModule->expects($this->any())->method('getUnencryptedBlockSize')->willReturn(8192); + return $this->encryptionModule; } /** @@ -151,4 +163,43 @@ class Encryption extends \Test\Files\Storage\Storage { array('source', '/subFolder/target', true), ); } + + /** + * @dataProvider dataTestCopy + * + * @param string $source + * @param string $target + * @param boolean $shouldUpdate + */ + public function testCopy($source, $target, $shouldUpdate) { + $this->keyStore + ->expects($this->once()) + ->method('copyKeys'); + $this->util->expects($this->any()) + ->method('isFile')->willReturn(true); + if ($shouldUpdate) { + $this->update->expects($this->once()) + ->method('update'); + } else { + $this->update->expects($this->never()) + ->method('update'); + } + + $this->instance->mkdir($source); + $this->instance->mkdir(dirname($target)); + $this->instance->copy($source, $target); + } + + /** + * data provider for testRename() + * + * @return array + */ + public function dataTestCopy() { + return array( + array('source', 'target', false), + array('source', '/subFolder/target', true), + ); + } + } -- cgit v1.2.3 From 24128d1384f2548f0cdc35c26d684dbeb61d091b Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 24 Apr 2015 10:16:06 +0200 Subject: only update share keys if the file was encrypted --- lib/private/encryption/keys/storage.php | 9 +++++++++ lib/private/files/storage/wrapper/encryption.php | 14 ++++++++++---- lib/public/encryption/keys/istorage.php | 2 ++ tests/lib/files/storage/wrapper/encryption.php | 6 ++++-- 4 files changed, 25 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php index e34d7370ef1..118c8dc920d 100644 --- a/lib/private/encryption/keys/storage.php +++ b/lib/private/encryption/keys/storage.php @@ -235,6 +235,7 @@ class Storage implements IStorage { * * @param string $source * @param string $target + * @return boolean */ public function renameKeys($source, $target) { @@ -253,7 +254,11 @@ class Storage implements IStorage { if ($this->view->file_exists($sourcePath)) { $this->keySetPreparation(dirname($targetPath)); $this->view->rename($sourcePath, $targetPath); + + return true; } + + return false; } /** @@ -261,6 +266,7 @@ class Storage implements IStorage { * * @param string $source * @param string $target + * @return boolean */ public function copyKeys($source, $target) { @@ -279,7 +285,10 @@ class Storage implements IStorage { if ($this->view->file_exists($sourcePath)) { $this->keySetPreparation(dirname($targetPath)); $this->view->copy($sourcePath, $targetPath); + return true; } + + return false; } /** diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 0f6096adb76..4d546495aaa 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -230,8 +230,11 @@ class Encryption extends Wrapper { if (isset($this->unencryptedSize[$source])) { $this->unencryptedSize[$target] = $this->unencryptedSize[$source]; } - $this->keyStorage->renameKeys($source, $target); - if (dirname($source) !== dirname($target) && $this->util->isFile($target)) { + $keysRenamed = $this->keyStorage->renameKeys($source, $target); + if ($keysRenamed && + dirname($source) !== dirname($target) && + $this->util->isFile($target) + ) { $this->update->update($target); } } @@ -256,8 +259,11 @@ class Encryption extends Wrapper { $result = $this->storage->copy($path1, $path2); if ($result) { $target = $this->getFullPath($path2); - $this->keyStorage->copyKeys($source, $target); - if (dirname($source) !== dirname($target) && $this->util->isFile($target)) { + $keysCopied = $this->keyStorage->copyKeys($source, $target); + if ($keysCopied && + dirname($source) !== dirname($target) && + $this->util->isFile($target) + ) { $this->update->update($target); } } diff --git a/lib/public/encryption/keys/istorage.php b/lib/public/encryption/keys/istorage.php index 696d5373310..ffbffdc1a27 100644 --- a/lib/public/encryption/keys/istorage.php +++ b/lib/public/encryption/keys/istorage.php @@ -153,6 +153,7 @@ interface IStorage { * * @param string $source * @param string $target + * @return boolean * @since 8.1.0 */ public function renameKeys($source, $target); @@ -162,6 +163,7 @@ interface IStorage { * * @param string $source * @param string $target + * @retrun boolean * @since 8.1.0 */ public function copyKeys($source, $target); diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index f22f02f568c..2d3f10ecdfa 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -136,7 +136,8 @@ class Encryption extends \Test\Files\Storage\Storage { public function testRename($source, $target, $shouldUpdate) { $this->keyStore ->expects($this->once()) - ->method('renameKeys'); + ->method('renameKeys') + ->willReturn(true); $this->util->expects($this->any()) ->method('isFile')->willReturn(true); if ($shouldUpdate) { @@ -174,7 +175,8 @@ class Encryption extends \Test\Files\Storage\Storage { public function testCopy($source, $target, $shouldUpdate) { $this->keyStore ->expects($this->once()) - ->method('copyKeys'); + ->method('copyKeys') + ->willReturn(true); $this->util->expects($this->any()) ->method('isFile')->willReturn(true); if ($shouldUpdate) { -- cgit v1.2.3 From 781cfff2216c4dfab109996f62ee7afd912dce17 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 24 Apr 2015 13:06:27 +0200 Subject: Deduplicate data provider and fix method visibility --- tests/lib/encryption/updatetest.php | 2 +- tests/lib/files/storage/wrapper/encryption.php | 32 +++++++++++--------------- 2 files changed, 15 insertions(+), 19 deletions(-) (limited to 'tests') diff --git a/tests/lib/encryption/updatetest.php b/tests/lib/encryption/updatetest.php index 28bb0031308..08d4125735d 100644 --- a/tests/lib/encryption/updatetest.php +++ b/tests/lib/encryption/updatetest.php @@ -52,7 +52,7 @@ class UpdateTest extends TestCase { /** @var \OC\Encryption\File | \PHPUnit_Framework_MockObject_MockObject */ private $fileHelper; - public function setUp() { + protected function setUp() { parent::setUp(); $this->view = $this->getMockBuilder('\OC\Files\View') diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index 2d3f10ecdfa..a257ca24a0c 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -44,7 +44,7 @@ class Encryption extends \Test\Files\Storage\Storage { */ private $update; - public function setUp() { + protected function setUp() { parent::setUp(); @@ -127,7 +127,7 @@ class Encryption extends \Test\Files\Storage\Storage { } /** - * @dataProvider dataTestRename + * @dataProvider dataTestCopyAndRename * * @param string $source * @param string $target @@ -154,25 +154,13 @@ class Encryption extends \Test\Files\Storage\Storage { } /** - * data provider for testRename() - * - * @return array - */ - public function dataTestRename() { - return array( - array('source', 'target', false), - array('source', '/subFolder/target', true), - ); - } - - /** - * @dataProvider dataTestCopy + * @dataProvider dataTestCopyAndRename * * @param string $source * @param string $target * @param boolean $shouldUpdate */ - public function testCopy($source, $target, $shouldUpdate) { + public function testCopyTesting($source, $target, $shouldUpdate) { $this->keyStore ->expects($this->once()) ->method('copyKeys') @@ -193,12 +181,20 @@ class Encryption extends \Test\Files\Storage\Storage { } /** - * data provider for testRename() + * @dataProvider copyAndMoveProvider + */ + public function testCopy($source, $target) { + $this->assertTrue(true, 'Replaced by testCopyTesting()'); + } + + /** + * data provider for testCopyTesting() and dataTestCopyAndRename() * * @return array */ - public function dataTestCopy() { + public function dataTestCopyAndRename() { return array( + array('source', 'target', false), array('source', 'target', false), array('source', '/subFolder/target', true), ); -- cgit v1.2.3 From 411f7893bf34507ba0b12b35a35596cd65c90b48 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 24 Apr 2015 14:27:23 +0200 Subject: Add test "operation on keys failed" --- tests/lib/files/storage/wrapper/encryption.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index a257ca24a0c..de43c24659e 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -131,13 +131,14 @@ class Encryption extends \Test\Files\Storage\Storage { * * @param string $source * @param string $target + * @param boolean $renameKeysReturn * @param boolean $shouldUpdate */ - public function testRename($source, $target, $shouldUpdate) { + public function testRename($source, $target, $renameKeysReturn, $shouldUpdate) { $this->keyStore ->expects($this->once()) ->method('renameKeys') - ->willReturn(true); + ->willReturn($renameKeysReturn); $this->util->expects($this->any()) ->method('isFile')->willReturn(true); if ($shouldUpdate) { @@ -158,13 +159,14 @@ class Encryption extends \Test\Files\Storage\Storage { * * @param string $source * @param string $target + * @param boolean $copyKeysReturn * @param boolean $shouldUpdate */ - public function testCopyTesting($source, $target, $shouldUpdate) { + public function testCopyTesting($source, $target, $copyKeysReturn, $shouldUpdate) { $this->keyStore ->expects($this->once()) ->method('copyKeys') - ->willReturn(true); + ->willReturn($copyKeysReturn); $this->util->expects($this->any()) ->method('isFile')->willReturn(true); if ($shouldUpdate) { @@ -194,9 +196,10 @@ class Encryption extends \Test\Files\Storage\Storage { */ public function dataTestCopyAndRename() { return array( - array('source', 'target', false), - array('source', 'target', false), - array('source', '/subFolder/target', true), + array('source', 'target', false, false), + array('source', 'target', true, false), + array('source', '/subFolder/target', false, false), + array('source', '/subFolder/target', true, true), ); } -- cgit v1.2.3