nextcloud /
server
@@ -41,81 +41,81 @@ |
||
| 41 | 41 | */ |
| 42 | 42 | class EncryptionWrapper { |
| 43 | 43 | |
| 44 | - /** @var ArrayCache */ |
|
| 45 | - private $arrayCache; |
|
| 44 | + /** @var ArrayCache */ |
|
| 45 | + private $arrayCache; |
|
| 46 | 46 | |
| 47 | - /** @var Manager */ |
|
| 48 | - private $manager; |
|
| 47 | + /** @var Manager */ |
|
| 48 | + private $manager; |
|
| 49 | 49 | |
| 50 | - /** @var ILogger */ |
|
| 51 | - private $logger; |
|
| 50 | + /** @var ILogger */ |
|
| 51 | + private $logger; |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * EncryptionWrapper constructor. |
|
| 55 | - * |
|
| 56 | - * @param ArrayCache $arrayCache |
|
| 57 | - * @param Manager $manager |
|
| 58 | - * @param ILogger $logger |
|
| 59 | - */ |
|
| 60 | - public function __construct(ArrayCache $arrayCache, |
|
| 61 | - Manager $manager, |
|
| 62 | - ILogger $logger |
|
| 63 | - ) { |
|
| 64 | - $this->arrayCache = $arrayCache; |
|
| 65 | - $this->manager = $manager; |
|
| 66 | - $this->logger = $logger; |
|
| 67 | - } |
|
| 53 | + /** |
|
| 54 | + * EncryptionWrapper constructor. |
|
| 55 | + * |
|
| 56 | + * @param ArrayCache $arrayCache |
|
| 57 | + * @param Manager $manager |
|
| 58 | + * @param ILogger $logger |
|
| 59 | + */ |
|
| 60 | + public function __construct(ArrayCache $arrayCache, |
|
| 61 | + Manager $manager, |
|
| 62 | + ILogger $logger |
|
| 63 | + ) { |
|
| 64 | + $this->arrayCache = $arrayCache; |
|
| 65 | + $this->manager = $manager; |
|
| 66 | + $this->logger = $logger; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * Wraps the given storage when it is not a shared storage |
|
| 71 | - * |
|
| 72 | - * @param string $mountPoint |
|
| 73 | - * @param Storage $storage |
|
| 74 | - * @param IMountPoint $mount |
|
| 75 | - * @return Encryption|Storage |
|
| 76 | - */ |
|
| 77 | - public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) { |
|
| 78 | - $parameters = [ |
|
| 79 | - 'storage' => $storage, |
|
| 80 | - 'mountPoint' => $mountPoint, |
|
| 81 | - 'mount' => $mount |
|
| 82 | - ]; |
|
| 69 | + /** |
|
| 70 | + * Wraps the given storage when it is not a shared storage |
|
| 71 | + * |
|
| 72 | + * @param string $mountPoint |
|
| 73 | + * @param Storage $storage |
|
| 74 | + * @param IMountPoint $mount |
|
| 75 | + * @return Encryption|Storage |
|
| 76 | + */ |
|
| 77 | + public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) { |
|
| 78 | + $parameters = [ |
|
| 79 | + 'storage' => $storage, |
|
| 80 | + 'mountPoint' => $mountPoint, |
|
| 81 | + 'mount' => $mount |
|
| 82 | + ]; |
|
| 83 | 83 | |
| 84 | - if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class) && $mountPoint !== '/') { |
|
| 85 | - $user = \OC::$server->getUserSession()->getUser(); |
|
| 86 | - $mountManager = Filesystem::getMountManager(); |
|
| 87 | - $uid = $user ? $user->getUID() : null; |
|
| 88 | - $fileHelper = \OC::$server->getEncryptionFilesHelper(); |
|
| 89 | - $keyStorage = \OC::$server->getEncryptionKeyStorage(); |
|
| 84 | + if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class) && $mountPoint !== '/') { |
|
| 85 | + $user = \OC::$server->getUserSession()->getUser(); |
|
| 86 | + $mountManager = Filesystem::getMountManager(); |
|
| 87 | + $uid = $user ? $user->getUID() : null; |
|
| 88 | + $fileHelper = \OC::$server->getEncryptionFilesHelper(); |
|
| 89 | + $keyStorage = \OC::$server->getEncryptionKeyStorage(); |
|
| 90 | 90 | |
| 91 | - $util = new Util( |
|
| 92 | - new View(), |
|
| 93 | - \OC::$server->getUserManager(), |
|
| 94 | - \OC::$server->getGroupManager(), |
|
| 95 | - \OC::$server->getConfig() |
|
| 96 | - ); |
|
| 97 | - $update = new Update( |
|
| 98 | - new View(), |
|
| 99 | - $util, |
|
| 100 | - Filesystem::getMountManager(), |
|
| 101 | - $this->manager, |
|
| 102 | - $fileHelper, |
|
| 103 | - $uid |
|
| 104 | - ); |
|
| 105 | - return new Encryption( |
|
| 106 | - $parameters, |
|
| 107 | - $this->manager, |
|
| 108 | - $util, |
|
| 109 | - $this->logger, |
|
| 110 | - $fileHelper, |
|
| 111 | - $uid, |
|
| 112 | - $keyStorage, |
|
| 113 | - $update, |
|
| 114 | - $mountManager, |
|
| 115 | - $this->arrayCache |
|
| 116 | - ); |
|
| 117 | - } else { |
|
| 118 | - return $storage; |
|
| 119 | - } |
|
| 120 | - } |
|
| 91 | + $util = new Util( |
|
| 92 | + new View(), |
|
| 93 | + \OC::$server->getUserManager(), |
|
| 94 | + \OC::$server->getGroupManager(), |
|
| 95 | + \OC::$server->getConfig() |
|
| 96 | + ); |
|
| 97 | + $update = new Update( |
|
| 98 | + new View(), |
|
| 99 | + $util, |
|
| 100 | + Filesystem::getMountManager(), |
|
| 101 | + $this->manager, |
|
| 102 | + $fileHelper, |
|
| 103 | + $uid |
|
| 104 | + ); |
|
| 105 | + return new Encryption( |
|
| 106 | + $parameters, |
|
| 107 | + $this->manager, |
|
| 108 | + $util, |
|
| 109 | + $this->logger, |
|
| 110 | + $fileHelper, |
|
| 111 | + $uid, |
|
| 112 | + $keyStorage, |
|
| 113 | + $update, |
|
| 114 | + $mountManager, |
|
| 115 | + $this->arrayCache |
|
| 116 | + ); |
|
| 117 | + } else { |
|
| 118 | + return $storage; |
|
| 119 | + } |
|
| 120 | + } |
|
| 121 | 121 | } |
