diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2018-07-05 16:57:48 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2018-07-05 17:24:44 +0200 |
| commit | 5d0fa12e1291addef1251fd2b1777f203fbf161b (patch) | |
| tree | 9d0a1963a228607063005625e2e8405c8e1f42f9 /lib/private | |
| parent | cbfcfb236f3e8ace6c64ab5a654b9a331a3ce1c0 (diff) | |
| download | nextcloud-server-5d0fa12e1291addef1251fd2b1777f203fbf161b.tar.gz nextcloud-server-5d0fa12e1291addef1251fd2b1777f203fbf161b.zip | |
allow to disable encryption
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/Encryption.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 109de4c4e5c..42653b2d4a6 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -412,9 +412,13 @@ class Encryption extends Wrapper { || $mode === 'wb' || $mode === 'wb+' ) { - // don't overwrite encrypted files if encryption is not enabled + // if we update a encrypted file with a un-encrypted one we change the db flag if ($targetIsEncrypted && $encryptionEnabled === false) { - throw new GenericEncryptionException('Tried to access encrypted file but encryption is not enabled'); + $cache = $this->storage->getCache(); + if ($cache) { + $entry = $cache->get($path); + $cache->update($entry->getId(), ['encrypted' => 0]); + } } if ($encryptionEnabled) { // if $encryptionModuleId is empty, the default module will be used |