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

Merge pull request #24249 from nextcloud/backport/24241/stable20 

[stable20] Harden EncryptionLegacyCipher a bit
This commit is contained in:
Morris Jobke 2020-11-20 22:42:17 +01:00 committed by GitHub
parent e772fd6409 06286f8c0e
commit 347aaf23b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,10 @@ class EncryptionLegacyCipher implements IRepairStep {
} }
public function run(IOutput $output): void { public function run(IOutput $output): void {
if (!$this->shouldRun()) {
return;
}
if ($this->manager->isEnabled()) { if ($this->manager->isEnabled()) {
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);

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

@ -54,6 +54,10 @@ class EncryptionMigration implements IRepairStep {
} }
public function run(IOutput $output): void { public function run(IOutput $output): void {
if (!$this->shouldRun()) {
return;
}
if ($this->manager->isEnabled()) { if ($this->manager->isEnabled()) {
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);