From 2c1f6331a4d6a5d4663d57858f10faa851e33d82 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 27 Nov 2018 16:54:00 +0100 Subject: Add interface to allow storages from opting out of encryption As opposed to hard-coding a list of excluded storages Signed-off-by: Robin Appelman --- lib/private/Encryption/EncryptionWrapper.php | 4 +-- .../Files/Storage/IDisableEncryptionStorage.php | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 lib/public/Files/Storage/IDisableEncryptionStorage.php (limited to 'lib') diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index d0f3ae79d48..c4650d39ee3 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -82,9 +82,7 @@ class EncryptionWrapper { 'mount' => $mount ]; - if (!$storage->instanceOfStorage('OCA\Files_Sharing\SharedStorage') - && !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') - && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) { + if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class)) { $user = \OC::$server->getUserSession()->getUser(); $mountManager = Filesystem::getMountManager(); diff --git a/lib/public/Files/Storage/IDisableEncryptionStorage.php b/lib/public/Files/Storage/IDisableEncryptionStorage.php new file mode 100644 index 00000000000..5ec4a2be843 --- /dev/null +++ b/lib/public/Files/Storage/IDisableEncryptionStorage.php @@ -0,0 +1,31 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCP\Files\Storage; + +/** + * Marks that a storage does not support server side encryption + * + * @since 16.0.0 + */ +interface IDisableEncryptionStorage { + +} \ No newline at end of file -- cgit v1.2.3