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

versions should always use the keys of the original file, no need to create new one

This commit is contained in:
Bjoern Schiessle 2015-09-29 13:17:39 +02:00
parent 50874de1ca
commit e7232a848b
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/private/files/storage/wrapper/encryption.php
View File

@ -232,7 +232,11 @@ class Encryption extends Wrapper {
$result = $this->storage->rename($path1, $path2);
if ($result && $this->encryptionManager->isEnabled()) {
if ($result &&
// versions always use the keys from the original file, so we can skip
// this step for versions
$this->isVersion($path2) === false &&
$this->encryptionManager->isEnabled()) {
$source = $this->getFullPath($path1);
if (!$this->util->isExcluded($source)) {
$target = $this->getFullPath($path2);
@ -449,7 +453,7 @@ class Encryption extends Wrapper {
public function copyFromStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
// TODO clean this up once the underlying moveFromStorage in OC\Files\Storage\Wrapper\Common is fixed:
// - call $this->storage->moveFromStorage() instead of $this->copyBetweenStorage
// - call $this->storage->copyFromStorage() instead of $this->copyBetweenStorage
// - copy the file cache update from $this->copyBetweenStorage to this method
// - copy the copyKeys() call from $this->copyBetweenStorage to this method
// - remove $this->copyBetweenStorage
@ -469,6 +473,13 @@ class Encryption extends Wrapper {
*/
private function copyBetweenStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, $isRename) {
// for versions we have nothing to do, because versions should always use the
// key from the original file. Just create a 1:1 copy and done
if ($this->isVersion($targetInternalPath) ||
$this->isVersion($sourceInternalPath)) {
return $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
}
// first copy the keys that we reuse the existing file key on the target location
// and don't create a new one which would break versions for example.
$mount = $this->mountManager->findByStorageId($sourceStorage->getId());
@ -741,4 +752,15 @@ class Encryption extends Wrapper {
return false;
}
/**
* check if path points to a files version
*
* @param $path
* @return bool
*/
protected function isVersion($path) {
$normalized = Filesystem::normalizePath($path);
return substr($normalized, 0, strlen('/files_versions/')) === '/files_versions/';
}
}

23
tests/lib/files/storage/wrapper/encryption.php
View File

@ -558,4 +558,27 @@ class Encryption extends \Test\Files\Storage\Storage {
$this->assertFalse(false);
}
/**
* @dataProvider dataTestIsVersion
* @param string $path
* @param bool $expected
*/
public function testIsVersion($path, $expected) {
$this->assertSame($expected,
$this->invokePrivate($this->instance, 'isVersion', [$path])
);
}
public function dataTestIsVersion() {
return [
['files_versions/foo', true],
['/files_versions/foo', true],
['//files_versions/foo', true],
['files/versions/foo', false],
['files/files_versions/foo', false],
['files_versions_test/foo', false],
];
}
}