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

Merge pull request #23709 from owncloud/stable9-make-sure-that-encrypted-version-is-set 

[stable9] Make sure that the encrypted version is set
This commit is contained in:
Thomas Müller 2016-04-01 09:08:50 +02:00
parent b84746ce36 d16553d2d8
commit 193a33a8ad
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ class Encryption extends Wrapper {
Manager $mountManager = null,
ArrayCache $arrayCache = null
) {
$this->mountPoint = $parameters['mountPoint'];
$this->mount = $parameters['mount'];
$this->encryptionManager = $encryptionManager;
@ -174,20 +174,25 @@ class Encryption extends Wrapper {
return null;
}
$fullPath = $this->getFullPath($path);
$info = $this->getCache()->get($path);
if (isset($this->unencryptedSize[$fullPath])) {
$data['encrypted'] = true;
$data['size'] = $this->unencryptedSize[$fullPath];
} else {
$info = $this->getCache()->get($path);
if (isset($info['fileid']) && $info['encrypted']) {
$data['size'] = $this->verifyUnencryptedSize($path, $info['size']);
$data['encrypted'] = true;
}
}
if (isset($info['encryptedVersion']) && $info['encryptedVersion'] > 1) {
$data['encryptedVersion'] = $info['encryptedVersion'];
}
return $data;
}
/**
* see http://php.net/manual/en/function.file_get_contents.php
*

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

@ -260,25 +260,39 @@ class Encryption extends Storage {
$this->invokePrivate($this->instance, 'unencryptedSize', [[$path => $storedUnencryptedSize]]);
}
$fileEntry = $this->getMockBuilder('\OC\Files\Cache\Cache')
->disableOriginalConstructor()->getMock();
$sourceStorage->expects($this->once())->method('getMetaData')->with($path)
->willReturn($metaData);
$sourceStorage->expects($this->any())
->method('getCache')
->with($path)
->willReturn($fileEntry);
$fileEntry->expects($this->any())
->method('get')
->with($metaData['fileid']);
$this->instance->expects($this->any())->method('getCache')->willReturn($cache);
$this->instance->expects($this->any())->method('verifyUnencryptedSize')
->with($path, 0)->willReturn($expected['size']);
$result = $this->instance->getMetaData($path);
$this->assertSame($expected['encrypted'], $result['encrypted']);
if(isset($expected['encrypted'])) {
$this->assertSame($expected['encrypted'], (bool)$result['encrypted']);
if(isset($expected['encryptedVersion'])) {
$this->assertSame($expected['encryptedVersion'], $result['encryptedVersion']);
}
}
$this->assertSame($expected['size'], $result['size']);
}
public function dataTestGetMetaData() {
return [
['/test.txt', ['size' => 42, 'encrypted' => false], true, true, 12, ['size' => 12, 'encrypted' => true]],
['/test.txt', ['size' => 42, 'encrypted' => 2, 'encryptedVersion' => 2, 'fileid' => 1], true, true, 12, ['size' => 12, 'encrypted' => true, 'encryptedVersion' => 2]],
['/test.txt', null, true, true, 12, null],
['/test.txt', ['size' => 42, 'encrypted' => false], false, false, 12, ['size' => 42, 'encrypted' => false]],
['/test.txt', ['size' => 42, 'encrypted' => false], true, false, 12, ['size' => 12, 'encrypted' => true]]
['/test.txt', ['size' => 42, 'encrypted' => 0, 'fileid' => 1], false, false, 12, ['size' => 42, 'encrypted' => false]],
['/test.txt', ['size' => 42, 'encrypted' => false, 'fileid' => 1], true, false, 12, ['size' => 12, 'encrypted' => true]]
];
}