Skip to content

[stable31] feat(encryption): Add integration tests for occ commands and fix them #55061

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

Closed
backportbot wants to merge 8 commits into from
Closed

[stable31] feat(encryption): Add integration tests for occ commands and fix them #55061

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8fd9a7f
feat(encryption): Add integration tests for occ commands
come-nc Aug 7, 2025
3df2180
chore(tests): Adapt encryption tests to code changes
come-nc Aug 25, 2025
536b0ac
chore(encryption): Cleanup typing in EncryptAll/DecryptAll
come-nc Aug 25, 2025
2903ec3
fix(encryption): Correctly set encrypted to 0 when copying
come-nc Sep 2, 2025
826fe17
fix(encryption): Take encryption enabled status into account
come-nc Sep 2, 2025
560be35
fix(tests): Fix type issues and other problems with encryption tests
come-nc Sep 4, 2025
5a4d123
chore: Improve wording of logged error in apps/encryption/lib/KeyMana…
come-nc Sep 8, 2025
e9b874e
chore(encryption): Remove unused attribute $uid in KeyManager::getFil…
come-nc Sep 8, 2025
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
Next Next commit
fix(encryption): Take encryption enabled status into account 
shouldEncrypt now returns false for all paths if encryption is disabled.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Sep 11, 2025
commit 826fe17b8aee313e0f5c04358d24b6b3f59c13ca
7 changes: 5 additions & 2 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 @@ -337,7 +337,7 @@ public function fopen(string $path, string $mode) {
}

// encryption disabled on write of new file and write to existing unencrypted file -> don't encrypt
if (!$encryptionEnabled || !$this->shouldEncrypt($path)) {
if (!$this->shouldEncrypt($path)) {
if (!$targetExists || !$targetIsEncrypted) {
$shouldEncrypt = false;
}
Expand Down Expand Up @@ -573,7 +573,7 @@ private function updateEncryptedVersion(
bool $isRename,
bool $keepEncryptionVersion,
): void {
$isEncrypted = $this->encryptionManager->isEnabled() && $this->shouldEncrypt($targetInternalPath);
$isEncrypted = $this->shouldEncrypt($targetInternalPath);
$cacheInformation = [
'encrypted' => $isEncrypted,
];
Expand Down Expand Up @@ -873,6 +873,9 @@ protected function isVersion(string $path): bool {
* check if the given storage should be encrypted or not
*/
public function shouldEncrypt(string $path): bool {
if (!$this->encryptionManager->isEnabled()) {
return false;
}
$fullPath = $this->getFullPath($path);
$mountPointConfig = $this->mount->getOption('encrypt', true);
if ($mountPointConfig === false) {
Expand Down