RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow server-side encryption 

See https://github.com/pulsejet/memories/issues/99
pull/175/head
Philipp Niedermayer 2022-11-07 22:21:20 +01:00 committed by GitHub
parent 86de94c210
commit d465400969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Command/Index.php
View File

@ -191,9 +191,9 @@ class Index extends Command
// Time measurement
$startTime = microtime(true);
if ($this->encryptionManager->isEnabled()) {
error_log('FATAL: Encryption is enabled. Aborted.');
if ($this->encryptionManager->isEnabled() && $this->encryptionManager->getDefaultEncryptionModuleId() != 'OC_DEFAULT_MODULE') {
// Can work with server-side but not with e2e encryption, see https://github.com/pulsejet/memories/issues/99
error_log('FATAL: Only server-side encryption (OC_DEFAULT_MODULE) is supported, but another encryption module is enabled. Aborted.');
return 1;
}
$this->output = $output;