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

Merge pull request #18009 from owncloud/enc_always_update_file_cache 

let the encryption storage wrapper always update the file cache
This commit is contained in:
Thomas Müller 2015-08-03 12:50:01 +02:00
parent 4105d17133 51a67a54e0
commit af7bcb43b1
2 changed files with 9 additions and 8 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

@ -127,12 +127,11 @@ class Encryption extends Wrapper {
$info = $this->getCache()->get($path);
if (isset($this->unencryptedSize[$fullPath])) {
$size = $this->unencryptedSize[$fullPath];
// update file cache
$info['encrypted'] = true;
$info['size'] = $size;
$this->getCache()->put($path, $info);
if (isset($info['fileid'])) {
$info['encrypted'] = true;
$info['size'] = $size;
$this->getCache()->put($path, $info);
}
return $size;
}

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

@ -261,10 +261,12 @@ class Encryption extends \Test\Files\Storage\Storage {
->expects($this->once())
->method('copyKeys')
->willReturn($copyKeysReturn);
$this->cache->expects($this->once())
$this->cache->expects($this->atLeastOnce())
->method('put')
->with($this->anything(), ['encrypted' => true])
->willReturn(true);
->willReturnCallback(function($path, $data) {
$this->assertArrayHasKey('encrypted', $data);
$this->assertTrue($data['encrypted']);
});
} else {
$this->cache->expects($this->never())->method('put');
$this->keyStore->expects($this->never())->method('copyKeys');