nextcloud /
server
@@ -48,222 +48,222 @@ |
||
| 48 | 48 | |
| 49 | 49 | class Application extends \OCP\AppFramework\App { |
| 50 | 50 | |
| 51 | - /** @var IManager */ |
|
| 52 | - private $encryptionManager; |
|
| 53 | - /** @var IConfig */ |
|
| 54 | - private $config; |
|
| 55 | - |
|
| 56 | - /** |
|
| 57 | - * @param array $urlParams |
|
| 58 | - * @param bool $encryptionSystemReady |
|
| 59 | - */ |
|
| 60 | - public function __construct($urlParams = array(), $encryptionSystemReady = true) { |
|
| 61 | - parent::__construct('encryption', $urlParams); |
|
| 62 | - $this->encryptionManager = \OC::$server->getEncryptionManager(); |
|
| 63 | - $this->config = \OC::$server->getConfig(); |
|
| 64 | - $this->registerServices(); |
|
| 65 | - if($encryptionSystemReady === false) { |
|
| 66 | - /** @var Session $session */ |
|
| 67 | - $session = $this->getContainer()->query('Session'); |
|
| 68 | - $session->setStatus(Session::RUN_MIGRATION); |
|
| 69 | - } |
|
| 70 | - if ($this->encryptionManager->isEnabled() && $encryptionSystemReady) { |
|
| 71 | - /** @var Setup $setup */ |
|
| 72 | - $setup = $this->getContainer()->query('UserSetup'); |
|
| 73 | - $setup->setupSystem(); |
|
| 74 | - } |
|
| 75 | - } |
|
| 76 | - |
|
| 77 | - /** |
|
| 78 | - * register hooks |
|
| 79 | - */ |
|
| 80 | - |
|
| 81 | - public function registerHooks() { |
|
| 82 | - if (!$this->config->getSystemValue('maintenance', false)) { |
|
| 83 | - |
|
| 84 | - $container = $this->getContainer(); |
|
| 85 | - $server = $container->getServer(); |
|
| 86 | - // Register our hooks and fire them. |
|
| 87 | - $hookManager = new HookManager(); |
|
| 88 | - |
|
| 89 | - $hookManager->registerHook([ |
|
| 90 | - new UserHooks($container->query('KeyManager'), |
|
| 91 | - $server->getUserManager(), |
|
| 92 | - $server->getLogger(), |
|
| 93 | - $container->query('UserSetup'), |
|
| 94 | - $server->getUserSession(), |
|
| 95 | - $container->query('Util'), |
|
| 96 | - $container->query('Session'), |
|
| 97 | - $container->query('Crypt'), |
|
| 98 | - $container->query('Recovery')) |
|
| 99 | - ]); |
|
| 100 | - |
|
| 101 | - $hookManager->fireHooks(); |
|
| 102 | - |
|
| 103 | - } else { |
|
| 104 | - // Logout user if we are in maintenance to force re-login |
|
| 105 | - $this->getContainer()->getServer()->getUserSession()->logout(); |
|
| 106 | - } |
|
| 107 | - } |
|
| 108 | - |
|
| 109 | - public function registerEncryptionModule() { |
|
| 110 | - $container = $this->getContainer(); |
|
| 111 | - |
|
| 112 | - |
|
| 113 | - $this->encryptionManager->registerEncryptionModule( |
|
| 114 | - Encryption::ID, |
|
| 115 | - Encryption::DISPLAY_NAME, |
|
| 116 | - function() use ($container) { |
|
| 117 | - |
|
| 118 | - return new Encryption( |
|
| 119 | - $container->query('Crypt'), |
|
| 120 | - $container->query('KeyManager'), |
|
| 121 | - $container->query('Util'), |
|
| 122 | - $container->query('Session'), |
|
| 123 | - $container->query('EncryptAll'), |
|
| 124 | - $container->query('DecryptAll'), |
|
| 125 | - $container->getServer()->getLogger(), |
|
| 126 | - $container->getServer()->getL10N($container->getAppName()) |
|
| 127 | - ); |
|
| 128 | - }); |
|
| 129 | - |
|
| 130 | - } |
|
| 131 | - |
|
| 132 | - public function registerServices() { |
|
| 133 | - $container = $this->getContainer(); |
|
| 134 | - |
|
| 135 | - $container->registerService('Crypt', |
|
| 136 | - function (IAppContainer $c) { |
|
| 137 | - $server = $c->getServer(); |
|
| 138 | - return new Crypt($server->getLogger(), |
|
| 139 | - $server->getUserSession(), |
|
| 140 | - $server->getConfig(), |
|
| 141 | - $server->getL10N($c->getAppName())); |
|
| 142 | - }); |
|
| 143 | - |
|
| 144 | - $container->registerService('Session', |
|
| 145 | - function (IAppContainer $c) { |
|
| 146 | - $server = $c->getServer(); |
|
| 147 | - return new Session($server->getSession()); |
|
| 148 | - } |
|
| 149 | - ); |
|
| 150 | - |
|
| 151 | - $container->registerService('KeyManager', |
|
| 152 | - function (IAppContainer $c) { |
|
| 153 | - $server = $c->getServer(); |
|
| 154 | - |
|
| 155 | - return new KeyManager($server->getEncryptionKeyStorage(), |
|
| 156 | - $c->query('Crypt'), |
|
| 157 | - $server->getConfig(), |
|
| 158 | - $server->getUserSession(), |
|
| 159 | - new Session($server->getSession()), |
|
| 160 | - $server->getLogger(), |
|
| 161 | - $c->query('Util') |
|
| 162 | - ); |
|
| 163 | - }); |
|
| 164 | - |
|
| 165 | - $container->registerService('Recovery', |
|
| 166 | - function (IAppContainer $c) { |
|
| 167 | - $server = $c->getServer(); |
|
| 168 | - |
|
| 169 | - return new Recovery( |
|
| 170 | - $server->getUserSession(), |
|
| 171 | - $c->query('Crypt'), |
|
| 172 | - $server->getSecureRandom(), |
|
| 173 | - $c->query('KeyManager'), |
|
| 174 | - $server->getConfig(), |
|
| 175 | - $server->getEncryptionKeyStorage(), |
|
| 176 | - $server->getEncryptionFilesHelper(), |
|
| 177 | - new View()); |
|
| 178 | - }); |
|
| 179 | - |
|
| 180 | - $container->registerService('RecoveryController', function (IAppContainer $c) { |
|
| 181 | - $server = $c->getServer(); |
|
| 182 | - return new RecoveryController( |
|
| 183 | - $c->getAppName(), |
|
| 184 | - $server->getRequest(), |
|
| 185 | - $server->getConfig(), |
|
| 186 | - $server->getL10N($c->getAppName()), |
|
| 187 | - $c->query('Recovery')); |
|
| 188 | - }); |
|
| 189 | - |
|
| 190 | - $container->registerService('StatusController', function (IAppContainer $c) { |
|
| 191 | - $server = $c->getServer(); |
|
| 192 | - return new StatusController( |
|
| 193 | - $c->getAppName(), |
|
| 194 | - $server->getRequest(), |
|
| 195 | - $server->getL10N($c->getAppName()), |
|
| 196 | - $c->query('Session') |
|
| 197 | - ); |
|
| 198 | - }); |
|
| 199 | - |
|
| 200 | - $container->registerService('SettingsController', function (IAppContainer $c) { |
|
| 201 | - $server = $c->getServer(); |
|
| 202 | - return new SettingsController( |
|
| 203 | - $c->getAppName(), |
|
| 204 | - $server->getRequest(), |
|
| 205 | - $server->getL10N($c->getAppName()), |
|
| 206 | - $server->getUserManager(), |
|
| 207 | - $server->getUserSession(), |
|
| 208 | - $c->query('KeyManager'), |
|
| 209 | - $c->query('Crypt'), |
|
| 210 | - $c->query('Session'), |
|
| 211 | - $server->getSession(), |
|
| 212 | - $c->query('Util') |
|
| 213 | - ); |
|
| 214 | - }); |
|
| 215 | - |
|
| 216 | - $container->registerService('UserSetup', |
|
| 217 | - function (IAppContainer $c) { |
|
| 218 | - $server = $c->getServer(); |
|
| 219 | - return new Setup($server->getLogger(), |
|
| 220 | - $server->getUserSession(), |
|
| 221 | - $c->query('Crypt'), |
|
| 222 | - $c->query('KeyManager')); |
|
| 223 | - }); |
|
| 224 | - |
|
| 225 | - $container->registerService('Util', |
|
| 226 | - function (IAppContainer $c) { |
|
| 227 | - $server = $c->getServer(); |
|
| 228 | - |
|
| 229 | - return new Util( |
|
| 230 | - new View(), |
|
| 231 | - $c->query('Crypt'), |
|
| 232 | - $server->getLogger(), |
|
| 233 | - $server->getUserSession(), |
|
| 234 | - $server->getConfig(), |
|
| 235 | - $server->getUserManager()); |
|
| 236 | - }); |
|
| 237 | - |
|
| 238 | - $container->registerService('EncryptAll', |
|
| 239 | - function (IAppContainer $c) { |
|
| 240 | - $server = $c->getServer(); |
|
| 241 | - return new EncryptAll( |
|
| 242 | - $c->query('UserSetup'), |
|
| 243 | - $c->getServer()->getUserManager(), |
|
| 244 | - new View(), |
|
| 245 | - $c->query('KeyManager'), |
|
| 246 | - $c->query('Util'), |
|
| 247 | - $server->getConfig(), |
|
| 248 | - $server->getMailer(), |
|
| 249 | - $server->getL10N('encryption'), |
|
| 250 | - new QuestionHelper(), |
|
| 251 | - $server->getSecureRandom() |
|
| 252 | - ); |
|
| 253 | - } |
|
| 254 | - ); |
|
| 255 | - |
|
| 256 | - $container->registerService('DecryptAll', |
|
| 257 | - function (IAppContainer $c) { |
|
| 258 | - return new DecryptAll( |
|
| 259 | - $c->query('Util'), |
|
| 260 | - $c->query('KeyManager'), |
|
| 261 | - $c->query('Crypt'), |
|
| 262 | - $c->query('Session'), |
|
| 263 | - new QuestionHelper() |
|
| 264 | - ); |
|
| 265 | - } |
|
| 266 | - ); |
|
| 267 | - |
|
| 268 | - } |
|
| 51 | + /** @var IManager */ |
|
| 52 | + private $encryptionManager; |
|
| 53 | + /** @var IConfig */ |
|
| 54 | + private $config; |
|
| 55 | + |
|
| 56 | + /** |
|
| 57 | + * @param array $urlParams |
|
| 58 | + * @param bool $encryptionSystemReady |
|
| 59 | + */ |
|
| 60 | + public function __construct($urlParams = array(), $encryptionSystemReady = true) { |
|
| 61 | + parent::__construct('encryption', $urlParams); |
|
| 62 | + $this->encryptionManager = \OC::$server->getEncryptionManager(); |
|
| 63 | + $this->config = \OC::$server->getConfig(); |
|
| 64 | + $this->registerServices(); |
|
| 65 | + if($encryptionSystemReady === false) { |
|
| 66 | + /** @var Session $session */ |
|
| 67 | + $session = $this->getContainer()->query('Session'); |
|
| 68 | + $session->setStatus(Session::RUN_MIGRATION); |
|
| 69 | + } |
|
| 70 | + if ($this->encryptionManager->isEnabled() && $encryptionSystemReady) { |
|
| 71 | + /** @var Setup $setup */ |
|
| 72 | + $setup = $this->getContainer()->query('UserSetup'); |
|
| 73 | + $setup->setupSystem(); |
|
| 74 | + } |
|
| 75 | + } |
|
| 76 | + |
|
| 77 | + /** |
|
| 78 | + * register hooks |
|
| 79 | + */ |
|
| 80 | + |
|
| 81 | + public function registerHooks() { |
|
| 82 | + if (!$this->config->getSystemValue('maintenance', false)) { |
|
| 83 | + |
|
| 84 | + $container = $this->getContainer(); |
|
| 85 | + $server = $container->getServer(); |
|
| 86 | + // Register our hooks and fire them. |
|
| 87 | + $hookManager = new HookManager(); |
|
| 88 | + |
|
| 89 | + $hookManager->registerHook([ |
|
| 90 | + new UserHooks($container->query('KeyManager'), |
|
| 91 | + $server->getUserManager(), |
|
| 92 | + $server->getLogger(), |
|
| 93 | + $container->query('UserSetup'), |
|
| 94 | + $server->getUserSession(), |
|
| 95 | + $container->query('Util'), |
|
| 96 | + $container->query('Session'), |
|
| 97 | + $container->query('Crypt'), |
|
| 98 | + $container->query('Recovery')) |
|
| 99 | + ]); |
|
| 100 | + |
|
| 101 | + $hookManager->fireHooks(); |
|
| 102 | + |
|
| 103 | + } else { |
|
| 104 | + // Logout user if we are in maintenance to force re-login |
|
| 105 | + $this->getContainer()->getServer()->getUserSession()->logout(); |
|
| 106 | + } |
|
| 107 | + } |
|
| 108 | + |
|
| 109 | + public function registerEncryptionModule() { |
|
| 110 | + $container = $this->getContainer(); |
|
| 111 | + |
|
| 112 | + |
|
| 113 | + $this->encryptionManager->registerEncryptionModule( |
|
| 114 | + Encryption::ID, |
|
| 115 | + Encryption::DISPLAY_NAME, |
|
| 116 | + function() use ($container) { |
|
| 117 | + |
|
| 118 | + return new Encryption( |
|
| 119 | + $container->query('Crypt'), |
|
| 120 | + $container->query('KeyManager'), |
|
| 121 | + $container->query('Util'), |
|
| 122 | + $container->query('Session'), |
|
| 123 | + $container->query('EncryptAll'), |
|
| 124 | + $container->query('DecryptAll'), |
|
| 125 | + $container->getServer()->getLogger(), |
|
| 126 | + $container->getServer()->getL10N($container->getAppName()) |
|
| 127 | + ); |
|
| 128 | + }); |
|
| 129 | + |
|
| 130 | + } |
|
| 131 | + |
|
| 132 | + public function registerServices() { |
|
| 133 | + $container = $this->getContainer(); |
|
| 134 | + |
|
| 135 | + $container->registerService('Crypt', |
|
| 136 | + function (IAppContainer $c) { |
|
| 137 | + $server = $c->getServer(); |
|
| 138 | + return new Crypt($server->getLogger(), |
|
| 139 | + $server->getUserSession(), |
|
| 140 | + $server->getConfig(), |
|
| 141 | + $server->getL10N($c->getAppName())); |
|
| 142 | + }); |
|
| 143 | + |
|
| 144 | + $container->registerService('Session', |
|
| 145 | + function (IAppContainer $c) { |
|
| 146 | + $server = $c->getServer(); |
|
| 147 | + return new Session($server->getSession()); |
|
| 148 | + } |
|
| 149 | + ); |
|
| 150 | + |
|
| 151 | + $container->registerService('KeyManager', |
|
| 152 | + function (IAppContainer $c) { |
|
| 153 | + $server = $c->getServer(); |
|
| 154 | + |
|
| 155 | + return new KeyManager($server->getEncryptionKeyStorage(), |
|
| 156 | + $c->query('Crypt'), |
|
| 157 | + $server->getConfig(), |
|
| 158 | + $server->getUserSession(), |
|
| 159 | + new Session($server->getSession()), |
|
| 160 | + $server->getLogger(), |
|
| 161 | + $c->query('Util') |
|
| 162 | + ); |
|
| 163 | + }); |
|
| 164 | + |
|
| 165 | + $container->registerService('Recovery', |
|
| 166 | + function (IAppContainer $c) { |
|
| 167 | + $server = $c->getServer(); |
|
| 168 | + |
|
| 169 | + return new Recovery( |
|
| 170 | + $server->getUserSession(), |
|
| 171 | + $c->query('Crypt'), |
|
| 172 | + $server->getSecureRandom(), |
|
| 173 | + $c->query('KeyManager'), |
|
| 174 | + $server->getConfig(), |
|
| 175 | + $server->getEncryptionKeyStorage(), |
|
| 176 | + $server->getEncryptionFilesHelper(), |
|
| 177 | + new View()); |
|
| 178 | + }); |
|
| 179 | + |
|
| 180 | + $container->registerService('RecoveryController', function (IAppContainer $c) { |
|
| 181 | + $server = $c->getServer(); |
|
| 182 | + return new RecoveryController( |
|
| 183 | + $c->getAppName(), |
|
| 184 | + $server->getRequest(), |
|
| 185 | + $server->getConfig(), |
|
| 186 | + $server->getL10N($c->getAppName()), |
|
| 187 | + $c->query('Recovery')); |
|
| 188 | + }); |
|
| 189 | + |
|
| 190 | + $container->registerService('StatusController', function (IAppContainer $c) { |
|
| 191 | + $server = $c->getServer(); |
|
| 192 | + return new StatusController( |
|
| 193 | + $c->getAppName(), |
|
| 194 | + $server->getRequest(), |
|
| 195 | + $server->getL10N($c->getAppName()), |
|
| 196 | + $c->query('Session') |
|
| 197 | + ); |
|
| 198 | + }); |
|
| 199 | + |
|
| 200 | + $container->registerService('SettingsController', function (IAppContainer $c) { |
|
| 201 | + $server = $c->getServer(); |
|
| 202 | + return new SettingsController( |
|
| 203 | + $c->getAppName(), |
|
| 204 | + $server->getRequest(), |
|
| 205 | + $server->getL10N($c->getAppName()), |
|
| 206 | + $server->getUserManager(), |
|
| 207 | + $server->getUserSession(), |
|
| 208 | + $c->query('KeyManager'), |
|
| 209 | + $c->query('Crypt'), |
|
| 210 | + $c->query('Session'), |
|
| 211 | + $server->getSession(), |
|
| 212 | + $c->query('Util') |
|
| 213 | + ); |
|
| 214 | + }); |
|
| 215 | + |
|
| 216 | + $container->registerService('UserSetup', |
|
| 217 | + function (IAppContainer $c) { |
|
| 218 | + $server = $c->getServer(); |
|
| 219 | + return new Setup($server->getLogger(), |
|
| 220 | + $server->getUserSession(), |
|
| 221 | + $c->query('Crypt'), |
|
| 222 | + $c->query('KeyManager')); |
|
| 223 | + }); |
|
| 224 | + |
|
| 225 | + $container->registerService('Util', |
|
| 226 | + function (IAppContainer $c) { |
|
| 227 | + $server = $c->getServer(); |
|
| 228 | + |
|
| 229 | + return new Util( |
|
| 230 | + new View(), |
|
| 231 | + $c->query('Crypt'), |
|
| 232 | + $server->getLogger(), |
|
| 233 | + $server->getUserSession(), |
|
| 234 | + $server->getConfig(), |
|
| 235 | + $server->getUserManager()); |
|
| 236 | + }); |
|
| 237 | + |
|
| 238 | + $container->registerService('EncryptAll', |
|
| 239 | + function (IAppContainer $c) { |
|
| 240 | + $server = $c->getServer(); |
|
| 241 | + return new EncryptAll( |
|
| 242 | + $c->query('UserSetup'), |
|
| 243 | + $c->getServer()->getUserManager(), |
|
| 244 | + new View(), |
|
| 245 | + $c->query('KeyManager'), |
|
| 246 | + $c->query('Util'), |
|
| 247 | + $server->getConfig(), |
|
| 248 | + $server->getMailer(), |
|
| 249 | + $server->getL10N('encryption'), |
|
| 250 | + new QuestionHelper(), |
|
| 251 | + $server->getSecureRandom() |
|
| 252 | + ); |
|
| 253 | + } |
|
| 254 | + ); |
|
| 255 | + |
|
| 256 | + $container->registerService('DecryptAll', |
|
| 257 | + function (IAppContainer $c) { |
|
| 258 | + return new DecryptAll( |
|
| 259 | + $c->query('Util'), |
|
| 260 | + $c->query('KeyManager'), |
|
| 261 | + $c->query('Crypt'), |
|
| 262 | + $c->query('Session'), |
|
| 263 | + new QuestionHelper() |
|
| 264 | + ); |
|
| 265 | + } |
|
| 266 | + ); |
|
| 267 | + |
|
| 268 | + } |
|
| 269 | 269 | } |
@@ -29,6 +29,6 @@ |
||
| 29 | 29 | |
| 30 | 30 | $app = new Application([], $encryptionSystemReady); |
| 31 | 31 | if ($encryptionSystemReady) { |
| 32 | - $app->registerEncryptionModule(); |
|
| 33 | - $app->registerHooks(); |
|
| 32 | + $app->registerEncryptionModule(); |
|
| 33 | + $app->registerHooks(); |
|
| 34 | 34 | } |
