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

Merge pull request #24532 from nextcloud/backport/24409/stable20 

[stable20] Also run repair steps when encryption is disabled but a legacy key is present
This commit is contained in:
Roeland Jago Douma 2020-12-03 12:22:41 +01:00 committed by GitHub
parent 1a041f7ac7 14d95cb2e3
commit ce953d1571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/Repair/NC20/EncryptionLegacyCipher.php
View File

@ -58,7 +58,8 @@ class EncryptionLegacyCipher implements IRepairStep {
return; return;
} }
if ($this->manager->isEnabled()) { $masterKeyId = $this->config->getAppValue('encryption', 'masterKeyId');
if ($this->manager->isEnabled() || !empty($masterKeyId)) {
if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') { if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
$this->config->setSystemValue('encryption.legacy_format_support', true); $this->config->setSystemValue('encryption.legacy_format_support', true);
} }

3
lib/private/Repair/NC20/EncryptionMigration.php
View File

@ -58,7 +58,8 @@ class EncryptionMigration implements IRepairStep {
return; return;
} }
if ($this->manager->isEnabled()) { $masterKeyId = $this->config->getAppValue('encryption', 'masterKeyId');
if ($this->manager->isEnabled() || !empty($masterKeyId)) {
if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') { if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
$this->config->setSystemValue('encryption.key_storage_migrated', false); $this->config->setSystemValue('encryption.key_storage_migrated', false);
} }