diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-31 13:25:11 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:29 +0200 |
| commit | 4db75e34074fa34d5558754e751b726338180e28 (patch) | |
| tree | 866aa931eb396a1024b5cc630a440d8d005188ad | |
| parent | 3458b5ab4ce7d88e95afcdb3ed0e3ff79ad924c4 (diff) | |
| download | nextcloud-server-4db75e34074fa34d5558754e751b726338180e28.tar.gz nextcloud-server-4db75e34074fa34d5558754e751b726338180e28.zip | |
Setting up the encryption wrapper in a setup hook - temporarily fixes the wrapping order
| -rw-r--r-- | lib/base.php | 18 | ||||
| -rw-r--r-- | lib/private/encryption/manager.php | 20 |
2 files changed, 20 insertions, 18 deletions
diff --git a/lib/base.php b/lib/base.php index 44395be627d..a5ca08123ac 100644 --- a/lib/base.php +++ b/lib/base.php @@ -703,24 +703,8 @@ class OC { private static function registerEncryptionWrapper() { $enabled = self::$server->getEncryptionManager()->isEnabled(); if ($enabled) { - \OC\Files\Filesystem::addStorageWrapper('oc_encryption', function ($mountPoint, $storage, \OCP\Files\Mount\IMountPoint $mount) { - - $parameters = [ - 'storage' => $storage, - 'mountPoint' => $mountPoint, - 'mount' => $mount]; - $manager = \OC::$server->getEncryptionManager(); - $util = new \OC\Encryption\Util( - new \OC\Files\View(), - \OC::$server->getUserManager(), - \OC::$server->getConfig()); - $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); - }); + \OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC\Encryption\Manager', 'setupStorage'); } - } private static function registerEncryptionHooks() { diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index 7cd49d1c0e2..bf411ea95e9 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -23,7 +23,9 @@ namespace OC\Encryption; +use OC\Files\Storage\Wrapper\Encryption; use OCP\Encryption\IEncryptionModule; +use OCP\Files\Mount\IMountPoint; class Manager implements \OCP\Encryption\IManager { @@ -181,5 +183,21 @@ class Manager implements \OCP\Encryption\IManager { } } - + public static function setupStorage() { + \OC\Files\Filesystem::addStorageWrapper('oc_encryption', function ($mountPoint, $storage, IMountPoint $mount) { + $parameters = [ + 'storage' => $storage, + 'mountPoint' => $mountPoint, + 'mount' => $mount]; + $manager = \OC::$server->getEncryptionManager(); + $util = new \OC\Encryption\Util( + new \OC\Files\View(), + \OC::$server->getUserManager(), + \OC::$server->getConfig()); + $user = \OC::$server->getUserSession()->getUser(); + $logger = \OC::$server->getLogger(); + $uid = $user ? $user->getUID() : null; + return new Encryption($parameters, $manager, $util, $logger, $uid); + }); + } } |