upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge pull request #34724 from nextcloud/encryption-read-before-cache

Browse source 
fix reading newly written encrypted files before their cache entry is written
This commit is contained in:
Vincent Petry 2022-12-20 17:16:12 +01:00 committed by GitHub
commit 3bcbc4701a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/encryption/lib/Command/FixEncryptedVersion.php
View file

@ -22,6 +22,7 @@
namespace OCA\Encryption\Command;
use OC\Files\Storage\Wrapper\Encryption;
use OC\Files\View;
use OC\ServerNotAvailableException;
use OCA\Encryption\Util;
@ -190,6 +191,13 @@ class FixEncryptedVersion extends Command {
*/
private function verifyFileContent(string $path, OutputInterface $output, bool $ignoreCorrectEncVersionCall = true): bool {
try {
// since we're manually poking around the encrypted state we need to ensure that this isn't cached in the encryption wrapper
$mount = $this->view->getMount($path);
$storage = $mount->getStorage();
if ($storage && $storage->instanceOfStorage(Encryption::class)) {
$storage->clearIsEncryptedCache();
}
/**
* In encryption, the files are read in a block size of 8192 bytes
* Read block size of 8192 and a bit more (808 bytes)

20
lib/private/Files/Storage/Wrapper/Encryption.php
View file

@ -45,6 +45,7 @@ use OC\Files\Mount\Manager;
use OC\Files\ObjectStore\ObjectStoreStorage;
use OC\Files\Storage\LocalTempFileTrait;
use OC\Memcache\ArrayCache;
use OCP\Cache\CappedMemoryCache;
use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\Encryption\IFile;
use OCP\Encryption\IManager;
@ -95,6 +96,9 @@ class Encryption extends Wrapper {
/** @var ArrayCache */
private $arrayCache;
/** @var CappedMemoryCache<bool> */
private CappedMemoryCache $encryptedPaths;
/**
* @param array $parameters
*/
@ -122,6 +126,7 @@ class Encryption extends Wrapper {
$this->update = $update;
$this->mountManager = $mountManager;
$this->arrayCache = $arrayCache;
$this->encryptedPaths = new CappedMemoryCache();
parent::__construct($parameters);
}
@ -461,6 +466,7 @@ class Encryption extends Wrapper {
}
if ($shouldEncrypt === true && $encryptionModule !== null) {
$this->encryptedPaths->set($this->util->stripPartialFileExtension($path), true);
$headerSize = $this->getHeaderSize($path);
$source = $this->storage->fopen($path, $mode);
if (!is_resource($source)) {
@ -970,11 +976,13 @@ class Encryption extends Wrapper {
$result = [];
// 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
$isEncrypted = $this->encryptedPaths->get($realFile);
if (is_null($isEncrypted)) {
$info = $this->getCache()->get($path);
$isEncrypted = isset($info['encrypted']) && $info['encrypted'] === true;
}
$info = $this->getCache()->get($path);
if (isset($info['encrypted']) && $info['encrypted'] === true) {
if ($isEncrypted) {
$firstBlock = $this->readFirstBlock($path);
$result = $this->parseRawHeader($firstBlock);
@ -1087,4 +1095,8 @@ class Encryption extends Wrapper {
return $count;
}
public function clearIsEncryptedCache(): void {
$this->encryptedPaths->clear();
}
}