diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-04 12:51:41 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-04 12:51:41 +0200 |
| commit | 4996706078a901fa532b0fed0fb0bc264d1ba778 (patch) | |
| tree | 38975186744d2bf9e96b9f28f66864f4f3531412 /lib | |
| parent | 9b250baf9e1f4cf7a721304b0748758ece6f59f5 (diff) | |
| parent | 519d5688478d44de83ab4997b790c8e7c6371a10 (diff) | |
| download | nextcloud-server-4996706078a901fa532b0fed0fb0bc264d1ba778.tar.gz nextcloud-server-4996706078a901fa532b0fed0fb0bc264d1ba778.zip | |
Merge pull request #15338 from owncloud/encryption-mount-option
Add mount point to disable the encryption wrapper
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/base.php b/lib/base.php index b441d5f1927..98da75b61a8 100644 --- a/lib/base.php +++ b/lib/base.php @@ -703,14 +703,18 @@ class OC { private static function registerEncryptionWrapper() { $enabled = self::$server->getEncryptionManager()->isEnabled(); if ($enabled) { - \OC\Files\Filesystem::addStorageWrapper('oc_encryption', function ($mountPoint, $storage) { - $parameters = array('storage' => $storage, 'mountPoint' => $mountPoint); - $manager = \OC::$server->getEncryptionManager(); - $util = new \OC\Encryption\Util(new \OC\Files\View(), \OC::$server->getUserManager()); - $user = \OC::$server->getUserSession()->getUser(); - $logger = \OC::$server->getLogger(); - $uid = $user ? $user->getUID() : null; - return new \OC\Files\Storage\Wrapper\Encryption($parameters, $manager,$util, $logger, $uid); + \OC\Files\Filesystem::addStorageWrapper('oc_encryption', function ($mountPoint, $storage, \OCP\Files\Mount\IMountPoint $mount) { + if($mount->getOption('encrypt', true)) { + $parameters = array('storage' => $storage, 'mountPoint' => $mountPoint); + $manager = \OC::$server->getEncryptionManager(); + $util = new \OC\Encryption\Util(new \OC\Files\View(), \OC::$server->getUserManager()); + $user = \OC::$server->getUserSession()->getUser(); + $logger = \OC::$server->getLogger(); + $uid = $user ? $user->getUID() : null; + return new \OC\Files\Storage\Wrapper\Encryption($parameters, $manager, $util, $logger, $uid); + } else { + return $storage; + } }); } |