Skip to content

fix reading newly written encrypted files before their cache entry is written #34724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 2 commits into from
Dec 20, 2022
Merged

fix reading newly written encrypted files before their cache entry is written #34724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9b87c7
fix reading newly written encrypted files before their cache entry is…
icewind1991 Oct 21, 2022
e3a0e64
clear is-encrypted cache when trying to fix encrypted version
icewind1991 Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
clear is-encrypted cache when trying to fix encrypted version 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Dec 1, 2022
commit e3a0e646980b6f75b904e21bf127868aa8e2d66c
8 changes: 8 additions & 0 deletions apps/encryption/lib/Command/FixEncryptedVersion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -165,6 +166,13 @@ private function walkPathOfUser(string $user, string $path, OutputInterface $out
*/
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)
Expand Down
4 changes: 4 additions & 0 deletions lib/private/Files/Storage/Wrapper/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,4 +1095,8 @@ public function writeStream(string $path, $stream, int $size = null): int {

return $count;
}

public function clearIsEncryptedCache(): void {
$this->encryptedPaths->clear();
}
}