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

Merge pull request #24966 from nextcloud/jknockaert-patch-1 

avoid fread on directories and unencrypted files
This commit is contained in:
Lukas Reschke 2021-04-06 13:45:10 +02:00 committed by GitHub
parent 2056b76c5f 40fde94b4d
commit 4b4971ab52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/private/Files/Storage/Wrapper/Encryption.php
View File

@ -925,21 +925,20 @@ class Encryption extends Wrapper {
$path = $realFile; $path = $realFile;
} }
$firstBlock = $this->readFirstBlock($path); $result = [];
$result = $this->parseRawHeader($firstBlock);
// first check if it is an encrypted file at all
// We would do query to filecache only if we know that entry in filecache exists
$info = $this->getCache()->get($path);
if (isset($info['encrypted']) && $info['encrypted'] === true) {
$firstBlock = $this->readFirstBlock($path);
$result = $this->parseRawHeader($firstBlock);
// if the header doesn't contain a encryption module we check if it is a // if the header doesn't contain a encryption module we check if it is a
// legacy file. If true, we add the default encryption module // legacy file. If true, we add the default encryption module
if (!isset($result[Util::HEADER_ENCRYPTION_MODULE_KEY])) { if (!isset($result[Util::HEADER_ENCRYPTION_MODULE_KEY]) && (!empty($result) || $exists)) {
if (!empty($result)) {
$result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE'; $result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE';
} elseif ($exists) {
// if the header was empty we have to check first if it is a encrypted file at all
// We would do query to filecache only if we know that entry in filecache exists
$info = $this->getCache()->get($path);
if (isset($info['encrypted']) && $info['encrypted'] === true) {
$result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE';
}
} }
} }

18
tests/lib/Files/Storage/Wrapper/EncryptionTest.php
View File

@ -584,6 +584,14 @@ class EncryptionTest extends Storage {
$this->arrayCache $this->arrayCache
] ]
)->getMock(); )->getMock();
$cache = $this->getMockBuilder('\OC\Files\Cache\Cache')
->disableOriginalConstructor()->getMock();
$cache->expects($this->any())
->method('get')
->willReturnCallback(function ($path) {
return ['encrypted' => true, 'path' => $path];
});
$instance = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Encryption') $instance = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Encryption')
->setConstructorArgs( ->setConstructorArgs(
@ -597,9 +605,11 @@ class EncryptionTest extends Storage {
$this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache
] ]
) )
->setMethods(['readFirstBlock', 'parseRawHeader']) ->setMethods(['getCache','readFirstBlock', 'parseRawHeader'])
->getMock(); ->getMock();
$instance->expects($this->once())->method('getCache')->willReturn($cache);
$instance->expects($this->once())->method(('parseRawHeader')) $instance->expects($this->once())->method(('parseRawHeader'))
->willReturn([Util::HEADER_ENCRYPTION_MODULE_KEY => 'OC_DEFAULT_MODULE']); ->willReturn([Util::HEADER_ENCRYPTION_MODULE_KEY => 'OC_DEFAULT_MODULE']);
@ -677,8 +687,8 @@ class EncryptionTest extends Storage {
->setMethods(['readFirstBlock', 'parseRawHeader', 'getCache']) ->setMethods(['readFirstBlock', 'parseRawHeader', 'getCache'])
->getMock(); ->getMock();
$instance->expects($this->once())->method(('parseRawHeader'))->willReturn($header); $instance->expects($this->any())->method(('parseRawHeader'))->willReturn($header);
$instance->expects($this->any())->method('getCache')->willReturn($cache); $instance->expects($this->once())->method('getCache')->willReturn($cache);
$result = $this->invokePrivate($instance, 'getHeader', ['test.txt']); $result = $this->invokePrivate($instance, 'getHeader', ['test.txt']);
$this->assertSameSize($expected, $result); $this->assertSameSize($expected, $result);