Merge pull request #11392 from owncloud/fix_version_previews
we also encrypt/decrypt files in the versions folder
This commit is contained in:
commit
e5b4e54141
|
@ -49,12 +49,17 @@ class Proxy extends \OC_FileProxy {
|
||||||
* @param string $uid user
|
* @param string $uid user
|
||||||
* @return boolean
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
private function isExcludedPath($path, $uid) {
|
protected function isExcludedPath($path, $uid) {
|
||||||
|
|
||||||
$view = new \OC\Files\View();
|
$view = new \OC\Files\View();
|
||||||
|
|
||||||
// files outside of the files-folder are excluded
|
$path = \OC\Files\Filesystem::normalizePath($path);
|
||||||
if(strpos($path, '/' . $uid . '/files/') !== 0) {
|
|
||||||
|
// we only encrypt/decrypt files in the files and files_versions folder
|
||||||
|
if(
|
||||||
|
strpos($path, '/' . $uid . '/files/') !== 0 &&
|
||||||
|
strpos($path, '/' . $uid . '/files_versions/') !== 0) {
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -136,4 +136,42 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider isExcludedPathProvider
|
||||||
|
*/
|
||||||
|
function testIsExcludedPath($path, $expected) {
|
||||||
|
$this->view->mkdir(dirname($path));
|
||||||
|
$this->view->file_put_contents($path, "test");
|
||||||
|
|
||||||
|
$testClass = new DummyProxy();
|
||||||
|
|
||||||
|
$result = $testClass->isExcludedPathTesting($path, $this->userId);
|
||||||
|
$this->assertSame($expected, $result);
|
||||||
|
|
||||||
|
$this->view->deleteAll(dirname($path));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isExcludedPathProvider() {
|
||||||
|
return array(
|
||||||
|
array ('/' . \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files/test.txt', false),
|
||||||
|
array (\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files/test.txt', false),
|
||||||
|
array ('/files/test.txt', true),
|
||||||
|
array ('/' . \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files/versions/test.txt', false),
|
||||||
|
array ('/' . \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files_versions/test.txt', false),
|
||||||
|
array ('/' . \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files_trashbin/test.txt', true),
|
||||||
|
array ('/' . \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/file/test.txt', true),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dummy class to make protected methods available for testing
|
||||||
|
*/
|
||||||
|
class DummyProxy extends \OCA\Encryption\Proxy {
|
||||||
|
public function isExcludedPathTesting($path, $uid) {
|
||||||
|
return $this->isExcludedPath($path, $uid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue