2013-08-20 22:58:15 +00:00
|
|
|
<?php
|
2015-03-26 10:44:34 +00:00
|
|
|
/**
|
2016-07-21 15:07:57 +00:00
|
|
|
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
2016-10-31 10:07:54 +00:00
|
|
|
* @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
|
2016-07-21 15:07:57 +00:00
|
|
|
*
|
2016-05-26 17:56:05 +00:00
|
|
|
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
2015-03-26 10:44:34 +00:00
|
|
|
* @author Bart Visscher <bartv@thisnet.nl>
|
|
|
|
* @author Bernhard Posselt <dev@bernhard-posselt.com>
|
|
|
|
* @author Bernhard Reiter <ockham@raz.or.at>
|
2016-07-21 15:07:57 +00:00
|
|
|
* @author Bjoern Schiessle <bjoern@schiessle.org>
|
2016-05-26 17:56:05 +00:00
|
|
|
* @author Björn Schießle <bjoern@schiessle.org>
|
2015-03-26 10:44:34 +00:00
|
|
|
* @author Christopher Schäpers <kondou@ts.unde.re>
|
2016-07-21 15:07:57 +00:00
|
|
|
* @author Christoph Wurst <christoph@owncloud.com>
|
|
|
|
* @author Joas Schilling <coding@schilljs.com>
|
2015-03-26 10:44:34 +00:00
|
|
|
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
|
2016-05-26 17:56:05 +00:00
|
|
|
* @author Lukas Reschke <lukas@statuscode.ch>
|
2015-03-26 10:44:34 +00:00
|
|
|
* @author Morris Jobke <hey@morrisjobke.de>
|
2016-07-21 16:13:36 +00:00
|
|
|
* @author Robin Appelman <robin@icewind.nl>
|
2016-01-12 14:02:16 +00:00
|
|
|
* @author Robin McCorkell <robin@mccorkell.me.uk>
|
2016-07-21 15:07:57 +00:00
|
|
|
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
2015-03-26 10:44:34 +00:00
|
|
|
* @author Sander <brantje@gmail.com>
|
|
|
|
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
|
|
|
* @author Thomas Tanghus <thomas@tanghus.net>
|
|
|
|
* @author Vincent Petry <pvince81@owncloud.com>
|
2016-07-22 08:46:29 +00:00
|
|
|
* @author Roger Szabo <roger.szabo@web.de>
|
2015-03-26 10:44:34 +00:00
|
|
|
*
|
|
|
|
* @license AGPL-3.0
|
|
|
|
*
|
|
|
|
* This code is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Affero General Public License, version 3,
|
|
|
|
* as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* 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, version 3,
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
|
|
*
|
|
|
|
*/
|
2017-08-24 14:21:50 +00:00
|
|
|
|
2013-08-20 22:58:15 +00:00
|
|
|
namespace OC;
|
|
|
|
|
2014-12-05 18:56:29 +00:00
|
|
|
use bantu\IniGetWrapper\IniGetWrapper;
|
2017-05-16 00:46:42 +00:00
|
|
|
use OC\Accounts\AccountManager;
|
2017-03-20 09:16:56 +00:00
|
|
|
use OC\App\AppManager;
|
2017-04-23 20:10:17 +00:00
|
|
|
use OC\App\AppStore\Bundles\BundleFetcher;
|
2016-10-31 10:07:54 +00:00
|
|
|
use OC\App\AppStore\Fetcher\AppFetcher;
|
|
|
|
use OC\App\AppStore\Fetcher\CategoryFetcher;
|
2013-09-04 21:45:11 +00:00
|
|
|
use OC\AppFramework\Http\Request;
|
2017-03-21 09:00:02 +00:00
|
|
|
use OC\AppFramework\Utility\SimpleContainer;
|
2015-08-21 16:27:52 +00:00
|
|
|
use OC\AppFramework\Utility\TimeFactory;
|
2016-11-08 08:15:02 +00:00
|
|
|
use OC\Authentication\LoginCredentials\Store;
|
2017-08-24 14:06:37 +00:00
|
|
|
use OC\Command\CronBus;
|
2017-01-24 06:47:14 +00:00
|
|
|
use OC\Contacts\ContactsMenu\ActionFactory;
|
2014-10-03 18:39:09 +00:00
|
|
|
use OC\Diagnostics\EventLogger;
|
|
|
|
use OC\Diagnostics\QueryLogger;
|
2017-01-27 11:52:17 +00:00
|
|
|
use OC\Federation\CloudIdManager;
|
2015-11-26 16:47:53 +00:00
|
|
|
use OC\Files\Config\UserMountCache;
|
2015-12-03 13:10:05 +00:00
|
|
|
use OC\Files\Config\UserMountCacheListener;
|
2016-04-21 12:48:08 +00:00
|
|
|
use OC\Files\Mount\CacheMountProvider;
|
2016-05-17 19:40:55 +00:00
|
|
|
use OC\Files\Mount\LocalHomeMountProvider;
|
|
|
|
use OC\Files\Mount\ObjectHomeMountProvider;
|
2015-09-28 15:17:44 +00:00
|
|
|
use OC\Files\Node\HookConnector;
|
2016-03-11 13:00:36 +00:00
|
|
|
use OC\Files\Node\LazyRoot;
|
2015-06-11 09:29:27 +00:00
|
|
|
use OC\Files\Node\Root;
|
|
|
|
use OC\Files\View;
|
|
|
|
use OC\Http\Client\ClientService;
|
Add code integrity check
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-11-03 19:26:06 +00:00
|
|
|
use OC\IntegrityCheck\Checker;
|
|
|
|
use OC\IntegrityCheck\Helpers\AppLocator;
|
|
|
|
use OC\IntegrityCheck\Helpers\EnvironmentHelper;
|
|
|
|
use OC\IntegrityCheck\Helpers\FileAccessHelper;
|
2015-07-15 14:14:48 +00:00
|
|
|
use OC\Lock\DBLockingProvider;
|
2015-05-04 12:02:27 +00:00
|
|
|
use OC\Lock\MemcacheLockingProvider;
|
2015-05-21 14:11:10 +00:00
|
|
|
use OC\Lock\NoopLockingProvider;
|
2016-08-01 16:27:07 +00:00
|
|
|
use OC\Lockdown\LockdownManager;
|
2015-02-12 12:53:27 +00:00
|
|
|
use OC\Mail\Mailer;
|
2016-03-30 21:20:37 +00:00
|
|
|
use OC\Memcache\ArrayCache;
|
2017-03-20 09:16:56 +00:00
|
|
|
use OC\Memcache\Factory;
|
2015-08-31 10:24:37 +00:00
|
|
|
use OC\Notification\Manager;
|
2017-02-24 11:50:43 +00:00
|
|
|
use OC\OCS\DiscoveryService;
|
2016-11-16 10:40:52 +00:00
|
|
|
use OC\Repair\NC11\CleanPreviewsBackgroundJob;
|
2016-11-08 14:56:39 +00:00
|
|
|
use OC\RichObjectStrings\Validator;
|
2016-07-20 16:36:15 +00:00
|
|
|
use OC\Security\Bruteforce\Throttler;
|
2014-08-18 14:30:23 +00:00
|
|
|
use OC\Security\CertificateManager;
|
2016-01-28 13:33:02 +00:00
|
|
|
use OC\Security\CSP\ContentSecurityPolicyManager;
|
2014-08-26 17:02:40 +00:00
|
|
|
use OC\Security\Crypto;
|
2016-10-24 14:31:06 +00:00
|
|
|
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
|
2016-01-25 16:15:54 +00:00
|
|
|
use OC\Security\CSRF\CsrfTokenGenerator;
|
|
|
|
use OC\Security\CSRF\CsrfTokenManager;
|
|
|
|
use OC\Security\CSRF\TokenStorage\SessionStorage;
|
2014-11-04 15:05:31 +00:00
|
|
|
use OC\Security\Hasher;
|
2015-08-24 15:13:16 +00:00
|
|
|
use OC\Security\CredentialsManager;
|
2014-08-26 17:02:40 +00:00
|
|
|
use OC\Security\SecureRandom;
|
2015-02-16 21:12:47 +00:00
|
|
|
use OC\Security\TrustedDomainHelper;
|
2015-07-20 10:59:04 +00:00
|
|
|
use OC\Session\CryptoWrapper;
|
2017-03-20 13:22:06 +00:00
|
|
|
use OC\Share20\ShareHelper;
|
2014-09-08 17:58:43 +00:00
|
|
|
use OC\Tagging\TagMapper;
|
2017-02-17 15:42:07 +00:00
|
|
|
use OC\Template\SCSSCacher;
|
2016-08-12 13:30:35 +00:00
|
|
|
use OCA\Theming\ThemingDefaults;
|
2017-02-17 15:42:07 +00:00
|
|
|
|
2017-03-20 09:16:56 +00:00
|
|
|
use OCP\App\IAppManager;
|
2017-08-10 10:46:33 +00:00
|
|
|
use OCP\AppFramework\Utility\ITimeFactory;
|
2017-04-07 20:42:43 +00:00
|
|
|
use OCP\Defaults;
|
2017-02-17 15:42:07 +00:00
|
|
|
use OCA\Theming\Util;
|
2017-01-27 11:52:17 +00:00
|
|
|
use OCP\Federation\ICloudIdManager;
|
2016-11-08 08:15:02 +00:00
|
|
|
use OCP\Authentication\LoginCredentials\IStore;
|
2017-03-20 09:16:56 +00:00
|
|
|
use OCP\ICacheFactory;
|
2017-03-19 22:14:47 +00:00
|
|
|
use OCP\IDBConnection;
|
2016-04-14 13:38:00 +00:00
|
|
|
use OCP\IL10N;
|
2015-06-11 09:29:27 +00:00
|
|
|
use OCP\IServerContainer;
|
2017-03-20 09:16:56 +00:00
|
|
|
use OCP\ITempManager;
|
2017-01-24 06:47:14 +00:00
|
|
|
use OCP\Contacts\ContactsMenu\IActionFactory;
|
2017-07-22 11:46:09 +00:00
|
|
|
use OCP\Lock\ILockingProvider;
|
2016-11-10 14:33:00 +00:00
|
|
|
use OCP\RichObjectStrings\IValidator;
|
2016-01-28 13:33:02 +00:00
|
|
|
use OCP\Security\IContentSecurityPolicyManager;
|
2017-03-20 13:22:06 +00:00
|
|
|
use OCP\Share\IShareHelper;
|
2015-08-14 13:40:15 +00:00
|
|
|
use Symfony\Component\EventDispatcher\EventDispatcher;
|
|
|
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
2013-08-20 22:58:15 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Class Server
|
2014-07-16 12:25:31 +00:00
|
|
|
*
|
2013-08-20 22:58:15 +00:00
|
|
|
* @package OC
|
|
|
|
*
|
|
|
|
* TODO: hookup all manager classes
|
|
|
|
*/
|
2015-12-18 10:43:39 +00:00
|
|
|
class Server extends ServerContainer implements IServerContainer {
|
2014-11-27 13:50:14 +00:00
|
|
|
/** @var string */
|
|
|
|
private $webRoot;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param string $webRoot
|
2015-12-18 10:24:15 +00:00
|
|
|
* @param \OC\Config $config
|
2014-11-27 13:50:14 +00:00
|
|
|
*/
|
2015-12-18 10:24:15 +00:00
|
|
|
public function __construct($webRoot, \OC\Config $config) {
|
2015-07-24 11:43:50 +00:00
|
|
|
parent::__construct();
|
2014-11-27 13:50:14 +00:00
|
|
|
$this->webRoot = $webRoot;
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(\OCP\IServerContainer::class, function (IServerContainer $c) {
|
2017-01-24 06:47:14 +00:00
|
|
|
return $c;
|
|
|
|
});
|
|
|
|
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
|
|
|
|
$this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
|
2015-01-14 19:39:23 +00:00
|
|
|
|
2017-01-24 06:47:14 +00:00
|
|
|
$this->registerAlias(IActionFactory::class, ActionFactory::class);
|
|
|
|
|
|
|
|
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerService(\OCP\IPreview::class, function (Server $c) {
|
2016-10-16 14:48:11 +00:00
|
|
|
return new PreviewManager(
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getRootFolder(),
|
2016-11-10 13:04:59 +00:00
|
|
|
$c->getAppDataDir('preview'),
|
2017-01-04 15:51:44 +00:00
|
|
|
$c->getEventDispatcher(),
|
|
|
|
$c->getSession()->get('user_id')
|
2016-10-16 14:48:11 +00:00
|
|
|
);
|
2013-09-04 21:45:11 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('PreviewManager', \OCP\IPreview::class);
|
2015-01-14 19:39:23 +00:00
|
|
|
|
2016-10-14 13:09:51 +00:00
|
|
|
$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
|
|
|
|
return new \OC\Preview\Watcher(
|
|
|
|
$c->getAppDataDir('preview')
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
2015-01-14 19:39:23 +00:00
|
|
|
$this->registerService('EncryptionManager', function (Server $c) {
|
2015-07-24 10:24:18 +00:00
|
|
|
$view = new View();
|
|
|
|
$util = new Encryption\Util(
|
|
|
|
$view,
|
|
|
|
$c->getUserManager(),
|
|
|
|
$c->getGroupManager(),
|
|
|
|
$c->getConfig()
|
|
|
|
);
|
|
|
|
return new Encryption\Manager(
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->getL10N('core'),
|
|
|
|
new View(),
|
2016-03-30 21:20:37 +00:00
|
|
|
$util,
|
|
|
|
new ArrayCache()
|
2015-07-24 10:24:18 +00:00
|
|
|
);
|
2015-01-14 19:39:23 +00:00
|
|
|
});
|
|
|
|
|
2015-03-31 14:23:31 +00:00
|
|
|
$this->registerService('EncryptionFileHelper', function (Server $c) {
|
2015-07-24 10:24:18 +00:00
|
|
|
$util = new Encryption\Util(
|
|
|
|
new View(),
|
2015-04-15 11:19:17 +00:00
|
|
|
$c->getUserManager(),
|
|
|
|
$c->getGroupManager(),
|
|
|
|
$c->getConfig()
|
|
|
|
);
|
2016-10-19 19:27:34 +00:00
|
|
|
return new Encryption\File(
|
|
|
|
$util,
|
|
|
|
$c->getRootFolder(),
|
|
|
|
$c->getShareManager()
|
|
|
|
);
|
2015-03-31 14:23:31 +00:00
|
|
|
});
|
|
|
|
|
2015-04-22 09:18:18 +00:00
|
|
|
$this->registerService('EncryptionKeyStorage', function (Server $c) {
|
2015-07-24 10:24:18 +00:00
|
|
|
$view = new View();
|
|
|
|
$util = new Encryption\Util(
|
2015-04-22 09:18:18 +00:00
|
|
|
$view,
|
|
|
|
$c->getUserManager(),
|
|
|
|
$c->getGroupManager(),
|
|
|
|
$c->getConfig()
|
|
|
|
);
|
|
|
|
|
|
|
|
return new Encryption\Keys\Storage($view, $util);
|
2015-01-14 19:39:23 +00:00
|
|
|
});
|
2015-12-03 13:10:05 +00:00
|
|
|
$this->registerService('TagMapper', function (Server $c) {
|
2015-02-25 12:18:36 +00:00
|
|
|
return new TagMapper($c->getDatabaseConnection());
|
2014-09-08 17:58:43 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
|
|
|
|
$this->registerService(\OCP\ITagManager::class, function (Server $c) {
|
2014-09-08 17:58:43 +00:00
|
|
|
$tagMapper = $c->query('TagMapper');
|
2014-12-10 14:59:41 +00:00
|
|
|
return new TagManager($tagMapper, $c->getUserSession());
|
2013-09-17 22:37:00 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('TagManager', \OCP\ITagManager::class);
|
|
|
|
|
2016-01-19 15:17:49 +00:00
|
|
|
$this->registerService('SystemTagManagerFactory', function (Server $c) {
|
|
|
|
$config = $c->getConfig();
|
|
|
|
$factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
|
|
|
|
/** @var \OC\SystemTag\ManagerFactory $factory */
|
|
|
|
$factory = new $factoryClass($this);
|
|
|
|
return $factory;
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
|
2016-01-19 15:17:49 +00:00
|
|
|
return $c->query('SystemTagManagerFactory')->getManager();
|
2015-11-26 14:49:14 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
|
2016-01-19 15:17:49 +00:00
|
|
|
return $c->query('SystemTagManagerFactory')->getObjectMapper();
|
2015-11-26 14:49:14 +00:00
|
|
|
});
|
2016-09-18 16:36:53 +00:00
|
|
|
$this->registerService('RootFolder', function (Server $c) {
|
2016-02-18 08:21:32 +00:00
|
|
|
$manager = \OC\Files\Filesystem::getMountManager(null);
|
2013-09-15 20:24:57 +00:00
|
|
|
$view = new View();
|
2016-11-02 22:16:51 +00:00
|
|
|
$root = new Root(
|
|
|
|
$manager,
|
|
|
|
$view,
|
|
|
|
null,
|
|
|
|
$c->getUserMountCache(),
|
|
|
|
$this->getLogger(),
|
|
|
|
$this->getUserManager()
|
|
|
|
);
|
2015-09-28 15:17:44 +00:00
|
|
|
$connector = new HookConnector($root, $view);
|
|
|
|
$connector->viewToNode();
|
2016-10-14 13:09:51 +00:00
|
|
|
|
|
|
|
$previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
|
|
|
|
$previewConnector->connectWatcher();
|
|
|
|
|
2015-09-28 15:17:44 +00:00
|
|
|
return $root;
|
2013-09-15 20:24:57 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(\OCP\Files\IRootFolder::class, function (Server $c) {
|
|
|
|
return new LazyRoot(function () use ($c) {
|
2016-08-26 10:13:34 +00:00
|
|
|
return $c->query('RootFolder');
|
2016-03-11 13:00:36 +00:00
|
|
|
});
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\IUserManager::class, function (Server $c) {
|
2014-10-24 12:13:40 +00:00
|
|
|
$config = $c->getConfig();
|
2013-12-16 13:22:25 +00:00
|
|
|
return new \OC\User\Manager($config);
|
2013-09-20 10:45:56 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('UserManager', \OCP\IUserManager::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
|
2017-03-17 09:23:04 +00:00
|
|
|
$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
|
2014-12-04 13:15:55 +00:00
|
|
|
$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
|
|
|
|
\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
|
|
|
|
});
|
|
|
|
$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
|
|
|
|
\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
|
|
|
|
});
|
|
|
|
$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
|
|
|
|
\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
|
|
|
|
});
|
|
|
|
$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
|
|
|
|
\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
|
|
|
|
});
|
|
|
|
$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
|
|
|
|
\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
|
|
|
|
});
|
|
|
|
$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
|
|
|
|
\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
|
2015-07-02 14:25:11 +00:00
|
|
|
//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
|
|
|
|
\OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
|
2014-12-04 13:15:55 +00:00
|
|
|
});
|
|
|
|
return $groupManager;
|
2014-07-16 12:25:31 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('GroupManager', \OCP\IGroupManager::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(Store::class, function (Server $c) {
|
2016-11-08 08:15:02 +00:00
|
|
|
$session = $c->getSession();
|
2017-01-02 10:57:05 +00:00
|
|
|
if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
|
|
|
|
$tokenProvider = $c->query('OC\Authentication\Token\IProvider');
|
|
|
|
} else {
|
|
|
|
$tokenProvider = null;
|
|
|
|
}
|
2016-11-08 08:15:02 +00:00
|
|
|
$logger = $c->getLogger();
|
2017-01-02 10:57:05 +00:00
|
|
|
return new Store($session, $logger, $tokenProvider);
|
2016-11-08 08:15:02 +00:00
|
|
|
});
|
|
|
|
$this->registerAlias(IStore::class, Store::class);
|
2016-04-25 14:40:41 +00:00
|
|
|
$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
|
2016-04-25 12:10:55 +00:00
|
|
|
$dbConnection = $c->getDatabaseConnection();
|
|
|
|
return new Authentication\Token\DefaultTokenMapper($dbConnection);
|
|
|
|
});
|
2016-04-25 14:40:41 +00:00
|
|
|
$this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
|
|
|
|
$mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
|
2016-04-25 12:10:55 +00:00
|
|
|
$crypto = $c->getCrypto();
|
|
|
|
$config = $c->getConfig();
|
|
|
|
$logger = $c->getLogger();
|
2016-05-02 17:58:19 +00:00
|
|
|
$timeFactory = new TimeFactory();
|
|
|
|
return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
|
2016-04-25 12:10:55 +00:00
|
|
|
});
|
2016-05-18 10:03:22 +00:00
|
|
|
$this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
|
2017-03-21 09:00:02 +00:00
|
|
|
|
|
|
|
$this->registerService(\OCP\IUserSession::class, function (Server $c) {
|
2014-10-24 12:13:40 +00:00
|
|
|
$manager = $c->getUserManager();
|
2015-07-20 10:59:04 +00:00
|
|
|
$session = new \OC\Session\Memory('');
|
2016-05-02 17:58:19 +00:00
|
|
|
$timeFactory = new TimeFactory();
|
2016-04-27 10:01:13 +00:00
|
|
|
// Token providers might require a working database. This code
|
|
|
|
// might however be called when ownCloud is not yet setup.
|
|
|
|
if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
|
2016-05-18 10:03:22 +00:00
|
|
|
$defaultTokenProvider = $c->query('OC\Authentication\Token\IProvider');
|
2016-04-27 10:01:13 +00:00
|
|
|
} else {
|
|
|
|
$defaultTokenProvider = null;
|
|
|
|
}
|
2016-06-24 15:53:37 +00:00
|
|
|
|
2017-02-17 14:40:20 +00:00
|
|
|
$userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom(), $c->getLockdownManager());
|
2013-09-20 10:45:56 +00:00
|
|
|
$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
|
|
|
|
\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
|
|
|
|
});
|
|
|
|
$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
|
|
|
|
/** @var $user \OC\User\User */
|
|
|
|
\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
|
|
|
|
});
|
|
|
|
$userSession->listen('\OC\User', 'preDelete', function ($user) {
|
|
|
|
/** @var $user \OC\User\User */
|
|
|
|
\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
|
|
|
|
});
|
|
|
|
$userSession->listen('\OC\User', 'postDelete', function ($user) {
|
|
|
|
/** @var $user \OC\User\User */
|
|
|
|
\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
|
|
|
|
});
|
|
|
|
$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
|
|
|
|
/** @var $user \OC\User\User */
|
|
|
|
\OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
|
|
|
|
});
|
|
|
|
$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
|
|
|
|
/** @var $user \OC\User\User */
|
|
|
|
\OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
|
|
|
|
});
|
|
|
|
$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
|
|
|
|
\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
|
|
|
|
});
|
|
|
|
$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
|
|
|
|
/** @var $user \OC\User\User */
|
|
|
|
\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
|
|
|
|
});
|
2017-05-16 06:41:11 +00:00
|
|
|
$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
|
|
|
|
/** @var $user \OC\User\User */
|
|
|
|
\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
|
|
|
|
});
|
2013-09-20 10:45:56 +00:00
|
|
|
$userSession->listen('\OC\User', 'logout', function () {
|
|
|
|
\OC_Hook::emit('OC_User', 'logout', array());
|
|
|
|
});
|
2017-04-13 10:34:02 +00:00
|
|
|
$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
|
2016-01-18 19:27:43 +00:00
|
|
|
/** @var $user \OC\User\User */
|
2017-04-13 10:34:02 +00:00
|
|
|
\OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
|
2016-01-18 19:27:43 +00:00
|
|
|
});
|
2013-09-20 10:45:56 +00:00
|
|
|
return $userSession;
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('UserSession', \OCP\IUserSession::class);
|
2016-05-11 09:23:25 +00:00
|
|
|
|
2016-09-06 19:41:15 +00:00
|
|
|
$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
|
2017-08-10 10:46:33 +00:00
|
|
|
return new \OC\Authentication\TwoFactorAuth\Manager(
|
|
|
|
$c->getAppManager(),
|
|
|
|
$c->getSession(),
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getActivityManager(),
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->query(\OC\Authentication\Token\IProvider::class),
|
|
|
|
$c->query(ITimeFactory::class)
|
|
|
|
);
|
2016-05-11 09:23:25 +00:00
|
|
|
});
|
|
|
|
|
2017-03-26 17:40:41 +00:00
|
|
|
$this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
|
2017-03-17 13:30:46 +00:00
|
|
|
|
|
|
|
$this->registerService(\OC\AllConfig::class, function (Server $c) {
|
2014-11-27 15:40:12 +00:00
|
|
|
return new \OC\AllConfig(
|
2014-12-04 08:35:01 +00:00
|
|
|
$c->getSystemConfig()
|
2014-11-27 15:40:12 +00:00
|
|
|
);
|
|
|
|
});
|
2017-03-17 13:30:46 +00:00
|
|
|
$this->registerAlias('AllConfig', \OC\AllConfig::class);
|
|
|
|
$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
|
|
|
|
|
2015-12-18 10:24:15 +00:00
|
|
|
$this->registerService('SystemConfig', function ($c) use ($config) {
|
|
|
|
return new \OC\SystemConfig($config);
|
2013-09-20 18:21:24 +00:00
|
|
|
});
|
2017-03-17 13:30:46 +00:00
|
|
|
|
|
|
|
$this->registerService(\OC\AppConfig::class, function (Server $c) {
|
2016-01-07 09:26:00 +00:00
|
|
|
return new \OC\AppConfig($c->getDatabaseConnection());
|
2014-02-07 12:42:18 +00:00
|
|
|
});
|
2017-03-17 13:30:46 +00:00
|
|
|
$this->registerAlias('AppConfig', \OC\AppConfig::class);
|
|
|
|
$this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
|
|
|
|
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
|
2016-01-15 10:09:37 +00:00
|
|
|
return new \OC\L10N\Factory(
|
|
|
|
$c->getConfig(),
|
2016-01-27 14:54:57 +00:00
|
|
|
$c->getRequest(),
|
2016-03-18 12:59:44 +00:00
|
|
|
$c->getUserSession(),
|
|
|
|
\OC::$SERVERROOT
|
2016-01-15 10:09:37 +00:00
|
|
|
);
|
2013-09-25 16:34:01 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
|
2014-10-24 12:13:40 +00:00
|
|
|
$config = $c->getConfig();
|
2015-03-17 11:35:47 +00:00
|
|
|
$cacheFactory = $c->getMemCacheFactory();
|
2017-06-15 19:51:51 +00:00
|
|
|
$request = $c->getRequest();
|
2015-03-17 11:35:47 +00:00
|
|
|
return new \OC\URLGenerator(
|
|
|
|
$config,
|
2017-06-15 19:51:51 +00:00
|
|
|
$cacheFactory,
|
|
|
|
$request
|
2015-03-17 11:35:47 +00:00
|
|
|
);
|
2013-09-26 16:41:19 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
|
|
|
|
|
2014-07-16 12:25:31 +00:00
|
|
|
$this->registerService('AppHelper', function ($c) {
|
2013-09-26 16:41:19 +00:00
|
|
|
return new \OC\AppHelper();
|
|
|
|
});
|
2017-05-02 08:08:16 +00:00
|
|
|
$this->registerAlias('AppFetcher', AppFetcher::class);
|
2017-05-10 07:56:38 +00:00
|
|
|
$this->registerAlias('CategoryFetcher', CategoryFetcher::class);
|
2017-03-21 09:00:02 +00:00
|
|
|
|
|
|
|
$this->registerService(\OCP\ICache::class, function ($c) {
|
2015-06-15 15:54:48 +00:00
|
|
|
return new Cache\File();
|
2013-09-17 15:46:33 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('UserCache', \OCP\ICache::class);
|
|
|
|
|
2017-03-20 09:16:56 +00:00
|
|
|
$this->registerService(Factory::class, function (Server $c) {
|
2017-06-15 19:51:51 +00:00
|
|
|
|
2017-06-15 10:35:16 +00:00
|
|
|
$arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
|
|
|
|
'\\OC\\Memcache\\ArrayCache',
|
|
|
|
'\\OC\\Memcache\\ArrayCache',
|
|
|
|
'\\OC\\Memcache\\ArrayCache'
|
|
|
|
);
|
2015-01-14 18:25:00 +00:00
|
|
|
$config = $c->getConfig();
|
2017-06-15 19:51:51 +00:00
|
|
|
$request = $c->getRequest();
|
|
|
|
$urlGenerator = new URLGenerator($config, $arrayCacheFactory, $request);
|
2015-03-18 10:47:16 +00:00
|
|
|
|
2015-12-03 13:10:05 +00:00
|
|
|
if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
|
2015-03-18 10:47:16 +00:00
|
|
|
$v = \OC_App::getAppVersions();
|
2017-06-15 10:46:51 +00:00
|
|
|
$v['core'] = implode(',', \OC_Util::getVersion());
|
2015-03-18 10:47:16 +00:00
|
|
|
$version = implode(',', $v);
|
|
|
|
$instanceId = \OC_Util::getInstanceId();
|
|
|
|
$path = \OC::$SERVERROOT;
|
2017-06-15 10:35:16 +00:00
|
|
|
$prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . $urlGenerator->getBaseUrl());
|
2015-07-15 14:21:07 +00:00
|
|
|
return new \OC\Memcache\Factory($prefix, $c->getLogger(),
|
2015-03-18 10:47:16 +00:00
|
|
|
$config->getSystemValue('memcache.local', null),
|
2015-05-26 12:41:37 +00:00
|
|
|
$config->getSystemValue('memcache.distributed', null),
|
|
|
|
$config->getSystemValue('memcache.locking', null)
|
2015-03-18 10:47:16 +00:00
|
|
|
);
|
|
|
|
}
|
2017-06-15 10:35:16 +00:00
|
|
|
return $arrayCacheFactory;
|
2015-03-18 10:47:16 +00:00
|
|
|
|
2014-01-06 11:55:56 +00:00
|
|
|
});
|
2017-03-20 09:16:56 +00:00
|
|
|
$this->registerAlias('MemCacheFactory', Factory::class);
|
|
|
|
$this->registerAlias(ICacheFactory::class, Factory::class);
|
|
|
|
|
2016-04-14 13:41:04 +00:00
|
|
|
$this->registerService('RedisFactory', function (Server $c) {
|
|
|
|
$systemConfig = $c->getSystemConfig();
|
|
|
|
return new RedisFactory($systemConfig);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
|
|
|
|
$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
|
2016-05-02 09:57:24 +00:00
|
|
|
return new \OC\Activity\Manager(
|
2015-03-25 14:18:11 +00:00
|
|
|
$c->getRequest(),
|
|
|
|
$c->getUserSession(),
|
2016-11-10 14:33:00 +00:00
|
|
|
$c->getConfig(),
|
|
|
|
$c->query(IValidator::class)
|
2015-03-25 14:18:11 +00:00
|
|
|
);
|
2013-09-29 18:31:12 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
|
|
|
|
|
2016-11-25 14:21:16 +00:00
|
|
|
$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
|
|
|
|
return new \OC\Activity\EventMerger(
|
|
|
|
$c->getL10N('lib')
|
|
|
|
);
|
|
|
|
});
|
2016-11-10 14:33:00 +00:00
|
|
|
$this->registerAlias(IValidator::class, Validator::class);
|
2017-03-21 09:00:02 +00:00
|
|
|
|
|
|
|
$this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
|
2015-12-01 21:08:42 +00:00
|
|
|
return new AvatarManager(
|
|
|
|
$c->getUserManager(),
|
2016-09-07 14:09:22 +00:00
|
|
|
$c->getAppDataDir('avatar'),
|
2016-03-11 12:44:35 +00:00
|
|
|
$c->getL10N('lib'),
|
2016-08-29 12:55:23 +00:00
|
|
|
$c->getLogger(),
|
|
|
|
$c->getConfig()
|
2015-12-01 21:08:42 +00:00
|
|
|
);
|
2013-09-20 09:46:11 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\ILogger::class, function (Server $c) {
|
2017-01-05 11:47:27 +00:00
|
|
|
$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
|
|
|
|
$logger = Log::getLogClass($logType);
|
2014-05-06 23:55:06 +00:00
|
|
|
call_user_func(array($logger, 'init'));
|
|
|
|
|
|
|
|
return new Log($logger);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('Logger', \OCP\ILogger::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
|
2014-02-11 13:00:24 +00:00
|
|
|
$config = $c->getConfig();
|
2016-05-18 12:27:48 +00:00
|
|
|
return new \OC\BackgroundJob\JobList(
|
|
|
|
$c->getDatabaseConnection(),
|
|
|
|
$config,
|
|
|
|
new TimeFactory()
|
|
|
|
);
|
2014-02-11 13:00:24 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
|
2014-03-24 13:55:03 +00:00
|
|
|
$cacheFactory = $c->getMemCacheFactory();
|
2015-11-27 12:51:20 +00:00
|
|
|
$logger = $c->getLogger();
|
2014-03-24 13:55:03 +00:00
|
|
|
if ($cacheFactory->isAvailable()) {
|
2015-11-27 12:51:20 +00:00
|
|
|
$router = new \OC\Route\CachingRouter($cacheFactory->create('route'), $logger);
|
2014-03-24 13:55:03 +00:00
|
|
|
} else {
|
2015-11-27 12:51:20 +00:00
|
|
|
$router = new \OC\Route\Router($logger);
|
2014-03-24 13:55:03 +00:00
|
|
|
}
|
2014-03-10 13:04:58 +00:00
|
|
|
return $router;
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('Router', \OCP\Route\IRouter::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\ISearch::class, function ($c) {
|
2014-06-05 23:17:02 +00:00
|
|
|
return new Search();
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('Search', \OCP\ISearch::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(\OC\Security\RateLimiting\Limiter::class, function ($c) {
|
2017-04-12 19:27:40 +00:00
|
|
|
return new \OC\Security\RateLimiting\Limiter(
|
|
|
|
$this->getUserSession(),
|
|
|
|
$this->getRequest(),
|
|
|
|
new \OC\AppFramework\Utility\TimeFactory(),
|
|
|
|
$c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
|
|
|
|
);
|
|
|
|
});
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
|
2017-04-12 19:27:40 +00:00
|
|
|
return new \OC\Security\RateLimiting\Backend\MemoryCache(
|
|
|
|
$this->getMemCacheFactory(),
|
|
|
|
new \OC\AppFramework\Utility\TimeFactory()
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
|
2014-08-26 17:02:40 +00:00
|
|
|
return new SecureRandom();
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
|
2014-10-24 12:13:40 +00:00
|
|
|
return new Crypto($c->getConfig(), $c->getSecureRandom());
|
2014-08-26 17:02:40 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
|
2014-11-04 15:05:31 +00:00
|
|
|
return new Hasher($c->getConfig());
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('Hasher', \OCP\Security\IHasher::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
|
2015-08-24 15:13:16 +00:00
|
|
|
return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
|
|
|
|
|
2017-03-19 22:14:47 +00:00
|
|
|
$this->registerService(IDBConnection::class, function (Server $c) {
|
2014-11-27 15:40:12 +00:00
|
|
|
$systemConfig = $c->getSystemConfig();
|
2017-03-17 22:37:48 +00:00
|
|
|
$factory = new \OC\DB\ConnectionFactory($systemConfig);
|
2014-11-27 15:40:12 +00:00
|
|
|
$type = $systemConfig->getValue('dbtype', 'sqlite');
|
2014-09-10 11:24:49 +00:00
|
|
|
if (!$factory->isValidType($type)) {
|
2014-11-26 11:38:24 +00:00
|
|
|
throw new \OC\DatabaseException('Invalid database type');
|
2014-09-10 11:24:49 +00:00
|
|
|
}
|
2017-03-17 22:37:48 +00:00
|
|
|
$connectionParams = $factory->createConnectionParams();
|
2014-09-10 11:24:49 +00:00
|
|
|
$connection = $factory->getConnection($type, $connectionParams);
|
|
|
|
$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
|
|
|
|
return $connection;
|
|
|
|
});
|
2017-03-19 22:14:47 +00:00
|
|
|
$this->registerAlias('DatabaseConnection', IDBConnection::class);
|
2017-03-21 09:00:02 +00:00
|
|
|
|
2014-10-24 12:13:40 +00:00
|
|
|
$this->registerService('HTTPHelper', function (Server $c) {
|
|
|
|
$config = $c->getConfig();
|
2015-03-16 10:28:23 +00:00
|
|
|
return new HTTPHelper(
|
|
|
|
$config,
|
|
|
|
$c->getHTTPClientService()
|
|
|
|
);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
|
|
|
|
$this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
|
2015-03-16 10:28:23 +00:00
|
|
|
$user = \OC_User::getUser();
|
|
|
|
$uid = $user ? $user : null;
|
|
|
|
return new ClientService(
|
|
|
|
$c->getConfig(),
|
2017-05-19 20:51:26 +00:00
|
|
|
new \OC\Security\CertificateManager(
|
|
|
|
$uid,
|
|
|
|
new View(),
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->getSecureRandom()
|
|
|
|
)
|
2015-03-16 10:28:23 +00:00
|
|
|
);
|
2014-09-11 17:21:56 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
|
|
|
|
$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
|
2017-04-20 09:31:00 +00:00
|
|
|
$eventLogger = new EventLogger();
|
2015-08-24 10:00:37 +00:00
|
|
|
if ($c->getSystemConfig()->getValue('debug', false)) {
|
2017-04-20 09:31:00 +00:00
|
|
|
// In debug mode, module is being activated by default
|
|
|
|
$eventLogger->activate();
|
2014-10-02 23:16:57 +00:00
|
|
|
}
|
2017-04-20 09:31:00 +00:00
|
|
|
return $eventLogger;
|
2014-10-02 23:16:57 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
|
2017-04-20 09:31:00 +00:00
|
|
|
$queryLogger = new QueryLogger();
|
2015-08-24 10:00:37 +00:00
|
|
|
if ($c->getSystemConfig()->getValue('debug', false)) {
|
2017-04-20 09:31:00 +00:00
|
|
|
// In debug mode, module is being activated by default
|
|
|
|
$queryLogger->activate();
|
2014-10-02 23:35:07 +00:00
|
|
|
}
|
2017-04-20 09:31:00 +00:00
|
|
|
return $queryLogger;
|
2014-10-02 23:35:07 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
|
|
|
|
|
2017-03-20 09:16:56 +00:00
|
|
|
$this->registerService(TempManager::class, function (Server $c) {
|
2015-08-29 16:36:21 +00:00
|
|
|
return new TempManager(
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->getConfig()
|
|
|
|
);
|
2014-10-22 15:33:36 +00:00
|
|
|
});
|
2017-03-20 09:16:56 +00:00
|
|
|
$this->registerAlias('TempManager', TempManager::class);
|
|
|
|
$this->registerAlias(ITempManager::class, TempManager::class);
|
|
|
|
|
|
|
|
$this->registerService(AppManager::class, function (Server $c) {
|
2015-04-01 13:37:22 +00:00
|
|
|
return new \OC\App\AppManager(
|
|
|
|
$c->getUserSession(),
|
|
|
|
$c->getAppConfig(),
|
|
|
|
$c->getGroupManager(),
|
2016-02-09 01:51:12 +00:00
|
|
|
$c->getMemCacheFactory(),
|
|
|
|
$c->getEventDispatcher()
|
2015-04-01 13:37:22 +00:00
|
|
|
);
|
2014-11-07 13:26:12 +00:00
|
|
|
});
|
2017-03-20 09:16:56 +00:00
|
|
|
$this->registerAlias('AppManager', AppManager::class);
|
|
|
|
$this->registerAlias(IAppManager::class, AppManager::class);
|
|
|
|
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
|
2014-12-16 14:34:55 +00:00
|
|
|
return new DateTimeZone(
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getSession()
|
|
|
|
);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
|
2014-11-24 15:37:04 +00:00
|
|
|
$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
|
|
|
|
|
2014-12-16 14:34:55 +00:00
|
|
|
return new DateTimeFormatter(
|
|
|
|
$c->getDateTimeZone()->getTimeZone(),
|
|
|
|
$c->getL10N('lib', $language)
|
|
|
|
);
|
2014-11-24 15:37:04 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
|
2015-12-03 13:10:05 +00:00
|
|
|
$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
|
|
|
|
$listener = new UserMountCacheListener($mountCache);
|
|
|
|
$listener->listen($c->getUserManager());
|
|
|
|
return $mountCache;
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
|
2014-11-24 14:54:42 +00:00
|
|
|
$loader = \OC\Files\Filesystem::getLoader();
|
2015-12-03 13:10:05 +00:00
|
|
|
$mountCache = $c->query('UserMountCache');
|
2017-08-24 14:21:50 +00:00
|
|
|
$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
|
2016-04-21 12:48:08 +00:00
|
|
|
|
|
|
|
// builtin providers
|
|
|
|
|
|
|
|
$config = $c->getConfig();
|
|
|
|
$manager->registerProvider(new CacheMountProvider($config));
|
2016-05-17 19:40:55 +00:00
|
|
|
$manager->registerHomeProvider(new LocalHomeMountProvider());
|
|
|
|
$manager->registerHomeProvider(new ObjectHomeMountProvider($config));
|
2016-04-21 12:48:08 +00:00
|
|
|
|
|
|
|
return $manager;
|
2014-11-24 14:54:42 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
|
|
|
|
|
2014-12-05 18:56:29 +00:00
|
|
|
$this->registerService('IniWrapper', function ($c) {
|
2014-12-05 18:57:06 +00:00
|
|
|
return new IniGetWrapper();
|
2014-12-05 18:56:29 +00:00
|
|
|
});
|
2015-02-17 15:49:14 +00:00
|
|
|
$this->registerService('AsyncCommandBus', function (Server $c) {
|
2017-08-24 14:21:50 +00:00
|
|
|
$busClass = $c->getConfig()->getSystemValue('commandbus');
|
|
|
|
if ($busClass) {
|
|
|
|
list($app, $class) = explode('::', $busClass, 2);
|
|
|
|
if ($c->getAppManager()->isInstalled($app)) {
|
|
|
|
\OC_App::loadApp($app);
|
|
|
|
return $c->query($class);
|
|
|
|
} else {
|
|
|
|
throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
$jobList = $c->getJobList();
|
|
|
|
return new CronBus($jobList);
|
|
|
|
}
|
2015-02-17 15:49:14 +00:00
|
|
|
});
|
2015-02-16 21:12:47 +00:00
|
|
|
$this->registerService('TrustedDomainHelper', function ($c) {
|
|
|
|
return new TrustedDomainHelper($this->getConfig());
|
|
|
|
});
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService('Throttler', function (Server $c) {
|
2016-07-20 16:36:15 +00:00
|
|
|
return new Throttler(
|
|
|
|
$c->getDatabaseConnection(),
|
|
|
|
new TimeFactory(),
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->getConfig()
|
|
|
|
);
|
|
|
|
});
|
Add code integrity check
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-11-03 19:26:06 +00:00
|
|
|
$this->registerService('IntegrityCodeChecker', function (Server $c) {
|
|
|
|
// IConfig and IAppManager requires a working database. This code
|
|
|
|
// might however be called when ownCloud is not yet setup.
|
2017-08-24 14:21:50 +00:00
|
|
|
if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
|
Add code integrity check
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-11-03 19:26:06 +00:00
|
|
|
$config = $c->getConfig();
|
|
|
|
$appManager = $c->getAppManager();
|
|
|
|
} else {
|
|
|
|
$config = null;
|
|
|
|
$appManager = null;
|
|
|
|
}
|
|
|
|
|
|
|
|
return new Checker(
|
2017-08-24 14:21:50 +00:00
|
|
|
new EnvironmentHelper(),
|
|
|
|
new FileAccessHelper(),
|
|
|
|
new AppLocator(),
|
|
|
|
$config,
|
|
|
|
$c->getMemCacheFactory(),
|
|
|
|
$appManager,
|
|
|
|
$c->getTempManager()
|
Add code integrity check
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-11-03 19:26:06 +00:00
|
|
|
);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerService(\OCP\IRequest::class, function ($c) {
|
2015-02-27 12:05:57 +00:00
|
|
|
if (isset($this['urlParams'])) {
|
|
|
|
$urlParams = $this['urlParams'];
|
|
|
|
} else {
|
|
|
|
$urlParams = [];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
|
|
|
|
&& in_array('fakeinput', stream_get_wrappers())
|
|
|
|
) {
|
|
|
|
$stream = 'fakeinput://data';
|
|
|
|
} else {
|
|
|
|
$stream = 'php://input';
|
|
|
|
}
|
|
|
|
|
|
|
|
return new Request(
|
|
|
|
[
|
|
|
|
'get' => $_GET,
|
|
|
|
'post' => $_POST,
|
|
|
|
'files' => $_FILES,
|
|
|
|
'server' => $_SERVER,
|
|
|
|
'env' => $_ENV,
|
|
|
|
'cookies' => $_COOKIE,
|
|
|
|
'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
|
|
|
|
? $_SERVER['REQUEST_METHOD']
|
|
|
|
: null,
|
|
|
|
'urlParams' => $urlParams,
|
|
|
|
],
|
|
|
|
$this->getSecureRandom(),
|
|
|
|
$this->getConfig(),
|
2016-01-25 16:15:54 +00:00
|
|
|
$this->getCsrfTokenManager(),
|
2015-02-27 12:05:57 +00:00
|
|
|
$stream
|
|
|
|
);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('Request', \OCP\IRequest::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
|
2015-03-16 12:01:17 +00:00
|
|
|
return new Mailer(
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getLogger(),
|
2017-04-11 14:35:46 +00:00
|
|
|
$c->query(Defaults::class),
|
|
|
|
$c->getURLGenerator(),
|
|
|
|
$c->getL10N('lib')
|
2015-03-16 12:01:17 +00:00
|
|
|
);
|
2015-02-12 12:53:27 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService('LDAPProvider', function (Server $c) {
|
2016-07-22 08:46:29 +00:00
|
|
|
$config = $c->getConfig();
|
|
|
|
$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
|
2017-08-24 14:21:50 +00:00
|
|
|
if (is_null($factoryClass)) {
|
2016-07-22 08:46:29 +00:00
|
|
|
throw new \Exception('ldapProviderFactory not set');
|
|
|
|
}
|
|
|
|
/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
|
|
|
|
$factory = new $factoryClass($this);
|
|
|
|
return $factory->getLDAPProvider();
|
|
|
|
});
|
2017-07-22 11:46:09 +00:00
|
|
|
$this->registerService(ILockingProvider::class, function (Server $c) {
|
2016-03-24 13:07:43 +00:00
|
|
|
$ini = $c->getIniWrapper();
|
|
|
|
$config = $c->getConfig();
|
|
|
|
$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
|
|
|
|
if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
|
2015-05-21 14:11:10 +00:00
|
|
|
/** @var \OC\Memcache\Factory $memcacheFactory */
|
|
|
|
$memcacheFactory = $c->getMemCacheFactory();
|
2015-05-26 12:41:37 +00:00
|
|
|
$memcache = $memcacheFactory->createLocking('lock');
|
2015-09-02 14:55:37 +00:00
|
|
|
if (!($memcache instanceof \OC\Memcache\NullCache)) {
|
2016-03-24 13:07:43 +00:00
|
|
|
return new MemcacheLockingProvider($memcache, $ttl);
|
2015-09-02 14:55:37 +00:00
|
|
|
}
|
2016-03-24 13:07:43 +00:00
|
|
|
return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
|
2015-05-21 14:11:10 +00:00
|
|
|
}
|
|
|
|
return new NoopLockingProvider();
|
2015-05-04 12:02:27 +00:00
|
|
|
});
|
2017-07-22 11:46:09 +00:00
|
|
|
$this->registerAlias('LockingProvider', ILockingProvider::class);
|
2017-03-21 09:00:02 +00:00
|
|
|
|
|
|
|
$this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
|
2015-07-01 13:57:04 +00:00
|
|
|
return new \OC\Files\Mount\Manager();
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
|
2015-07-20 10:28:36 +00:00
|
|
|
return new \OC\Files\Type\Detection(
|
|
|
|
$c->getURLGenerator(),
|
2016-07-29 15:47:39 +00:00
|
|
|
\OC::$configDir,
|
2015-09-08 10:17:57 +00:00
|
|
|
\OC::$SERVERROOT . '/resources/config/'
|
2015-12-03 13:10:05 +00:00
|
|
|
);
|
2015-04-09 13:19:57 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
|
|
|
|
|
|
|
|
$this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
|
2015-09-03 18:48:42 +00:00
|
|
|
return new \OC\Files\Type\Loader(
|
|
|
|
$c->getDatabaseConnection()
|
|
|
|
);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
|
2017-04-23 20:10:17 +00:00
|
|
|
$this->registerService(BundleFetcher::class, function () {
|
|
|
|
return new BundleFetcher($this->getL10N('lib'));
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
|
2016-11-08 14:56:39 +00:00
|
|
|
return new Manager(
|
2016-11-10 14:33:00 +00:00
|
|
|
$c->query(IValidator::class)
|
2016-11-08 14:56:39 +00:00
|
|
|
);
|
2015-08-31 10:24:37 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
|
|
|
|
|
|
|
|
$this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
|
2016-08-15 18:22:48 +00:00
|
|
|
$manager = new \OC\CapabilitiesManager($c->getLogger());
|
2015-12-03 13:10:05 +00:00
|
|
|
$manager->registerCapability(function () use ($c) {
|
2015-07-22 11:04:56 +00:00
|
|
|
return new \OC\OCS\CoreCapabilities($c->getConfig());
|
2015-07-21 19:44:59 +00:00
|
|
|
});
|
2017-07-12 19:46:25 +00:00
|
|
|
$manager->registerCapability(function () use ($c) {
|
|
|
|
return $c->query(\OC\Security\Bruteforce\Capabilities::class);
|
|
|
|
});
|
2015-07-21 19:44:59 +00:00
|
|
|
return $manager;
|
2015-03-21 19:03:56 +00:00
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(\OCP\Comments\ICommentsManager::class, function (Server $c) {
|
2015-11-23 22:53:55 +00:00
|
|
|
$config = $c->getConfig();
|
|
|
|
$factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
|
|
|
|
/** @var \OCP\Comments\ICommentsManagerFactory $factory */
|
2016-01-19 15:17:49 +00:00
|
|
|
$factory = new $factoryClass($this);
|
2015-11-23 22:53:55 +00:00
|
|
|
return $factory->getManager();
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService('ThemingDefaults', function (Server $c) {
|
2016-08-24 11:22:21 +00:00
|
|
|
/*
|
|
|
|
* Dark magic for autoloader.
|
|
|
|
* If we do a class_exists it will try to load the class which will
|
|
|
|
* make composer cache the result. Resulting in errors when enabling
|
|
|
|
* the theming app.
|
|
|
|
*/
|
|
|
|
$prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
|
|
|
|
if (isset($prefixes['OCA\\Theming\\'])) {
|
|
|
|
$classExists = true;
|
|
|
|
} else {
|
2016-07-22 14:49:33 +00:00
|
|
|
$classExists = false;
|
|
|
|
}
|
|
|
|
|
2017-07-21 09:46:35 +00:00
|
|
|
if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
|
2016-08-12 13:30:35 +00:00
|
|
|
return new ThemingDefaults(
|
2016-08-23 20:02:28 +00:00
|
|
|
$c->getConfig(),
|
|
|
|
$c->getL10N('theming'),
|
|
|
|
$c->getURLGenerator(),
|
2017-04-07 12:51:05 +00:00
|
|
|
$c->getAppDataDir('theming'),
|
2017-02-17 15:42:07 +00:00
|
|
|
$c->getMemCacheFactory(),
|
2017-09-12 07:09:45 +00:00
|
|
|
new Util($c->getConfig(), $this->getAppManager(), $this->getAppDataDir('theming')),
|
|
|
|
$this->getAppManager()
|
2016-06-21 19:21:46 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
return new \OC_Defaults();
|
|
|
|
});
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(SCSSCacher::class, function (Server $c) {
|
2017-02-17 15:42:07 +00:00
|
|
|
/** @var Factory $cacheFactory */
|
|
|
|
$cacheFactory = $c->query(Factory::class);
|
|
|
|
return new SCSSCacher(
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->query(\OC\Files\AppData\Factory::class),
|
|
|
|
$c->getURLGenerator(),
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getThemingDefaults(),
|
|
|
|
\OC::$SERVERROOT,
|
2017-05-10 18:31:45 +00:00
|
|
|
$cacheFactory->create('SCSS')
|
2017-02-17 15:42:07 +00:00
|
|
|
);
|
|
|
|
});
|
2017-03-19 22:14:47 +00:00
|
|
|
$this->registerService(EventDispatcher::class, function () {
|
2015-08-14 13:40:15 +00:00
|
|
|
return new EventDispatcher();
|
|
|
|
});
|
2017-03-19 22:14:47 +00:00
|
|
|
$this->registerAlias('EventDispatcher', EventDispatcher::class);
|
|
|
|
$this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
|
|
|
|
|
2015-07-20 10:59:04 +00:00
|
|
|
$this->registerService('CryptoWrapper', function (Server $c) {
|
2015-08-21 16:27:52 +00:00
|
|
|
// FIXME: Instantiiated here due to cyclic dependency
|
|
|
|
$request = new Request(
|
|
|
|
[
|
|
|
|
'get' => $_GET,
|
|
|
|
'post' => $_POST,
|
|
|
|
'files' => $_FILES,
|
|
|
|
'server' => $_SERVER,
|
|
|
|
'env' => $_ENV,
|
|
|
|
'cookies' => $_COOKIE,
|
|
|
|
'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
|
|
|
|
? $_SERVER['REQUEST_METHOD']
|
|
|
|
: null,
|
|
|
|
],
|
2016-01-09 18:57:03 +00:00
|
|
|
$c->getSecureRandom(),
|
2015-08-21 16:27:52 +00:00
|
|
|
$c->getConfig()
|
|
|
|
);
|
|
|
|
|
2015-07-20 10:59:04 +00:00
|
|
|
return new CryptoWrapper(
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getCrypto(),
|
2015-08-21 16:27:52 +00:00
|
|
|
$c->getSecureRandom(),
|
|
|
|
$request
|
2015-07-20 10:59:04 +00:00
|
|
|
);
|
|
|
|
});
|
2016-01-25 16:15:54 +00:00
|
|
|
$this->registerService('CsrfTokenManager', function (Server $c) {
|
|
|
|
$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
|
|
|
|
|
|
|
|
return new CsrfTokenManager(
|
|
|
|
$tokenGenerator,
|
2016-10-28 09:29:02 +00:00
|
|
|
$c->query(SessionStorage::class)
|
2016-01-25 16:15:54 +00:00
|
|
|
);
|
|
|
|
});
|
2016-10-28 09:29:02 +00:00
|
|
|
$this->registerService(SessionStorage::class, function (Server $c) {
|
|
|
|
return new SessionStorage($c->getSession());
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
|
2016-01-28 13:33:02 +00:00
|
|
|
return new ContentSecurityPolicyManager();
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService('ContentSecurityPolicyNonceManager', function (Server $c) {
|
2016-10-24 14:31:06 +00:00
|
|
|
return new ContentSecurityPolicyNonceManager(
|
2016-10-25 19:36:17 +00:00
|
|
|
$c->getCsrfTokenManager(),
|
|
|
|
$c->getRequest()
|
2016-10-24 14:31:06 +00:00
|
|
|
);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(\OCP\Share\IManager::class, function (Server $c) {
|
2016-01-11 09:30:03 +00:00
|
|
|
$config = $c->getConfig();
|
|
|
|
$factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory');
|
2016-05-02 09:59:54 +00:00
|
|
|
/** @var \OCP\Share\IProviderFactory $factory */
|
2016-01-20 07:30:37 +00:00
|
|
|
$factory = new $factoryClass($this);
|
2016-01-11 09:30:03 +00:00
|
|
|
|
|
|
|
$manager = new \OC\Share20\Manager(
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->getConfig(),
|
|
|
|
$c->getSecureRandom(),
|
|
|
|
$c->getHasher(),
|
|
|
|
$c->getMountManager(),
|
|
|
|
$c->getGroupManager(),
|
2017-09-08 08:34:19 +00:00
|
|
|
$c->getL10N('lib'),
|
|
|
|
$c->getL10NFactory(),
|
2016-02-02 20:02:09 +00:00
|
|
|
$factory,
|
2016-02-04 11:51:23 +00:00
|
|
|
$c->getUserManager(),
|
2016-06-24 15:53:37 +00:00
|
|
|
$c->getLazyRootFolder(),
|
2017-07-26 21:53:07 +00:00
|
|
|
$c->getEventDispatcher(),
|
|
|
|
$c->getMailer(),
|
|
|
|
$c->getURLGenerator(),
|
|
|
|
$c->getThemingDefaults()
|
2016-01-11 09:30:03 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
return $manager;
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
$this->registerAlias('ShareManager', \OCP\Share\IManager::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService('SettingsManager', function (Server $c) {
|
2016-08-08 21:31:26 +00:00
|
|
|
$manager = new \OC\Settings\Manager(
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->getDatabaseConnection(),
|
2016-11-10 10:08:37 +00:00
|
|
|
$c->getL10N('lib'),
|
2016-08-08 21:31:26 +00:00
|
|
|
$c->getConfig(),
|
|
|
|
$c->getEncryptionManager(),
|
2016-08-12 14:52:20 +00:00
|
|
|
$c->getUserManager(),
|
2016-12-28 15:58:02 +00:00
|
|
|
$c->getLockingProvider(),
|
2017-03-17 12:34:23 +00:00
|
|
|
$c->getRequest(),
|
2017-01-19 09:37:17 +00:00
|
|
|
new \OC\Settings\Mapper($c->getDatabaseConnection()),
|
2017-05-16 00:46:42 +00:00
|
|
|
$c->getURLGenerator(),
|
|
|
|
$c->query(AccountManager::class),
|
|
|
|
$c->getGroupManager(),
|
|
|
|
$c->getL10NFactory(),
|
2017-06-16 13:00:15 +00:00
|
|
|
$c->getThemingDefaults(),
|
|
|
|
$c->getAppManager()
|
2016-08-08 21:31:26 +00:00
|
|
|
);
|
|
|
|
return $manager;
|
|
|
|
});
|
2016-08-24 10:03:22 +00:00
|
|
|
$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
|
|
|
|
return new \OC\Files\AppData\Factory(
|
|
|
|
$c->getRootFolder(),
|
|
|
|
$c->getSystemConfig()
|
|
|
|
);
|
|
|
|
});
|
2016-11-16 10:40:52 +00:00
|
|
|
|
2016-08-01 16:27:07 +00:00
|
|
|
$this->registerService('LockdownManager', function (Server $c) {
|
2017-08-24 14:21:50 +00:00
|
|
|
return new LockdownManager(function () use ($c) {
|
2017-02-17 14:40:20 +00:00
|
|
|
return $c->getSession();
|
|
|
|
});
|
2016-08-01 16:27:07 +00:00
|
|
|
});
|
2016-11-16 10:40:52 +00:00
|
|
|
|
2017-04-05 20:35:59 +00:00
|
|
|
$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
|
2017-02-24 11:50:43 +00:00
|
|
|
return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
|
|
|
|
});
|
|
|
|
|
2017-01-27 11:52:17 +00:00
|
|
|
$this->registerService(ICloudIdManager::class, function (Server $c) {
|
|
|
|
return new CloudIdManager();
|
|
|
|
});
|
|
|
|
|
2016-11-16 10:40:52 +00:00
|
|
|
/* To trick DI since we don't extend the DIContainer here */
|
|
|
|
$this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
|
|
|
|
return new CleanPreviewsBackgroundJob(
|
|
|
|
$c->getRootFolder(),
|
|
|
|
$c->getLogger(),
|
|
|
|
$c->getJobList(),
|
|
|
|
new TimeFactory()
|
|
|
|
);
|
|
|
|
});
|
2017-03-21 09:00:02 +00:00
|
|
|
|
|
|
|
$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
|
|
|
|
$this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
|
|
|
|
|
|
|
|
$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
|
|
|
|
$this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
|
|
|
|
|
2017-04-07 20:42:43 +00:00
|
|
|
$this->registerService(Defaults::class, function (Server $c) {
|
|
|
|
return new Defaults(
|
|
|
|
$c->getThemingDefaults()
|
|
|
|
);
|
|
|
|
});
|
|
|
|
$this->registerAlias('Defaults', \OCP\Defaults::class);
|
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
|
2017-03-21 09:00:02 +00:00
|
|
|
return $c->query(\OCP\IUserSession::class)->getSession();
|
|
|
|
});
|
2017-03-20 13:22:06 +00:00
|
|
|
|
2017-08-24 14:21:50 +00:00
|
|
|
$this->registerService(IShareHelper::class, function (Server $c) {
|
2017-03-20 13:22:06 +00:00
|
|
|
return new ShareHelper(
|
2017-04-13 12:52:09 +00:00
|
|
|
$c->query(\OCP\Share\IManager::class)
|
2017-03-20 13:22:06 +00:00
|
|
|
);
|
|
|
|
});
|
2013-08-26 21:48:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2013-08-31 19:34:29 +00:00
|
|
|
* @return \OCP\Contacts\IManager
|
2013-08-26 21:48:18 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getContactsManager() {
|
2013-08-26 21:48:18 +00:00
|
|
|
return $this->query('ContactsManager');
|
|
|
|
}
|
2013-08-31 19:34:29 +00:00
|
|
|
|
2015-01-14 19:39:23 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\Encryption\Manager
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getEncryptionManager() {
|
2015-01-14 19:39:23 +00:00
|
|
|
return $this->query('EncryptionManager');
|
|
|
|
}
|
|
|
|
|
2015-03-31 14:23:31 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\Encryption\File
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getEncryptionFilesHelper() {
|
2015-03-31 14:23:31 +00:00
|
|
|
return $this->query('EncryptionFileHelper');
|
|
|
|
}
|
|
|
|
|
2015-01-14 19:39:23 +00:00
|
|
|
/**
|
|
|
|
* @return \OCP\Encryption\Keys\IStorage
|
|
|
|
*/
|
2015-04-22 09:18:18 +00:00
|
|
|
public function getEncryptionKeyStorage() {
|
|
|
|
return $this->query('EncryptionKeyStorage');
|
2015-01-14 19:39:23 +00:00
|
|
|
}
|
|
|
|
|
2013-08-31 19:34:29 +00:00
|
|
|
/**
|
2013-09-17 15:46:33 +00:00
|
|
|
* The current request object holding all information about the request
|
|
|
|
* currently being processed is returned from this method.
|
2013-08-31 19:34:29 +00:00
|
|
|
* In case the current execution was not initiated by a web request null is returned
|
|
|
|
*
|
2015-04-01 10:13:49 +00:00
|
|
|
* @return \OCP\IRequest
|
2013-08-31 19:34:29 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getRequest() {
|
2015-02-27 12:05:57 +00:00
|
|
|
return $this->query('Request');
|
2013-08-31 19:34:29 +00:00
|
|
|
}
|
2013-09-04 21:45:11 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the preview manager which can create preview images for a given file
|
|
|
|
*
|
|
|
|
* @return \OCP\IPreview
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getPreviewManager() {
|
2013-09-04 21:45:11 +00:00
|
|
|
return $this->query('PreviewManager');
|
|
|
|
}
|
2013-09-15 20:24:57 +00:00
|
|
|
|
2013-09-17 22:37:00 +00:00
|
|
|
/**
|
|
|
|
* Returns the tag manager which can get and set tags for different object types
|
|
|
|
*
|
2013-09-24 15:10:01 +00:00
|
|
|
* @see \OCP\ITagManager::load()
|
|
|
|
* @return \OCP\ITagManager
|
2013-09-17 22:37:00 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getTagManager() {
|
2013-09-17 22:37:00 +00:00
|
|
|
return $this->query('TagManager');
|
|
|
|
}
|
2013-09-15 20:24:57 +00:00
|
|
|
|
2015-11-26 14:49:14 +00:00
|
|
|
/**
|
|
|
|
* Returns the system-tag manager
|
|
|
|
*
|
|
|
|
* @return \OCP\SystemTag\ISystemTagManager
|
|
|
|
*
|
|
|
|
* @since 9.0.0
|
|
|
|
*/
|
|
|
|
public function getSystemTagManager() {
|
|
|
|
return $this->query('SystemTagManager');
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the system-tag object mapper
|
|
|
|
*
|
|
|
|
* @return \OCP\SystemTag\ISystemTagObjectMapper
|
|
|
|
*
|
|
|
|
* @since 9.0.0
|
|
|
|
*/
|
|
|
|
public function getSystemTagObjectMapper() {
|
|
|
|
return $this->query('SystemTagObjectMapper');
|
|
|
|
}
|
|
|
|
|
2013-09-20 09:46:11 +00:00
|
|
|
/**
|
|
|
|
* Returns the avatar manager, used for avatar functionality
|
|
|
|
*
|
2013-11-22 11:34:37 +00:00
|
|
|
* @return \OCP\IAvatarManager
|
2013-09-20 09:46:11 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getAvatarManager() {
|
2013-09-20 09:46:11 +00:00
|
|
|
return $this->query('AvatarManager');
|
|
|
|
}
|
|
|
|
|
2013-09-15 20:24:57 +00:00
|
|
|
/**
|
|
|
|
* Returns the root folder of ownCloud's data directory
|
|
|
|
*
|
2015-04-28 07:36:29 +00:00
|
|
|
* @return \OCP\Files\IRootFolder
|
2013-09-15 20:24:57 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getRootFolder() {
|
2016-08-26 10:13:34 +00:00
|
|
|
return $this->query('LazyRootFolder');
|
2013-09-15 20:24:57 +00:00
|
|
|
}
|
2013-09-17 15:46:33 +00:00
|
|
|
|
2016-03-11 13:00:36 +00:00
|
|
|
/**
|
|
|
|
* Returns the root folder of ownCloud's data directory
|
|
|
|
* This is the lazy variant so this gets only initialized once it
|
|
|
|
* is actually used.
|
|
|
|
*
|
|
|
|
* @return \OCP\Files\IRootFolder
|
|
|
|
*/
|
|
|
|
public function getLazyRootFolder() {
|
|
|
|
return $this->query('LazyRootFolder');
|
|
|
|
}
|
|
|
|
|
2013-09-18 12:25:12 +00:00
|
|
|
/**
|
|
|
|
* Returns a view to ownCloud's files folder
|
|
|
|
*
|
2014-08-31 07:49:19 +00:00
|
|
|
* @param string $userId user ID
|
2016-02-16 17:45:25 +00:00
|
|
|
* @return \OCP\Files\Folder|null
|
2013-09-18 12:25:12 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getUserFolder($userId = null) {
|
2014-10-02 23:16:57 +00:00
|
|
|
if ($userId === null) {
|
2014-08-31 07:49:19 +00:00
|
|
|
$user = $this->getUserSession()->getUser();
|
|
|
|
if (!$user) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
$userId = $user->getUID();
|
2014-07-25 15:52:50 +00:00
|
|
|
}
|
2013-09-18 12:25:12 +00:00
|
|
|
$root = $this->getRootFolder();
|
2015-06-16 14:02:30 +00:00
|
|
|
return $root->getUserFolder($userId);
|
2013-09-18 12:25:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns an app-specific view in ownClouds data directory
|
|
|
|
*
|
|
|
|
* @return \OCP\Files\Folder
|
2016-09-12 13:40:51 +00:00
|
|
|
* @deprecated since 9.2.0 use IAppData
|
2013-09-18 12:25:12 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getAppFolder() {
|
2014-07-22 17:45:01 +00:00
|
|
|
$dir = '/' . \OC_App::getCurrentApp();
|
2013-09-18 12:25:12 +00:00
|
|
|
$root = $this->getRootFolder();
|
2014-07-16 12:25:31 +00:00
|
|
|
if (!$root->nodeExists($dir)) {
|
2013-09-18 12:25:12 +00:00
|
|
|
$folder = $root->newFolder($dir);
|
|
|
|
} else {
|
|
|
|
$folder = $root->get($dir);
|
|
|
|
}
|
|
|
|
return $folder;
|
|
|
|
}
|
|
|
|
|
2013-09-20 10:45:56 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\User\Manager
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getUserManager() {
|
2013-09-20 10:45:56 +00:00
|
|
|
return $this->query('UserManager');
|
|
|
|
}
|
|
|
|
|
2014-07-16 12:25:31 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\Group\Manager
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getGroupManager() {
|
2014-07-16 12:25:31 +00:00
|
|
|
return $this->query('GroupManager');
|
|
|
|
}
|
|
|
|
|
2013-09-20 10:45:56 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\User\Session
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getUserSession() {
|
2013-09-20 10:45:56 +00:00
|
|
|
return $this->query('UserSession');
|
|
|
|
}
|
|
|
|
|
2014-07-16 17:40:22 +00:00
|
|
|
/**
|
|
|
|
* @return \OCP\ISession
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getSession() {
|
2014-07-16 17:40:22 +00:00
|
|
|
return $this->query('UserSession')->getSession();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param \OCP\ISession $session
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function setSession(\OCP\ISession $session) {
|
2016-10-28 09:29:02 +00:00
|
|
|
$this->query(SessionStorage::class)->setSession($session);
|
2016-11-19 15:33:19 +00:00
|
|
|
$this->query('UserSession')->setSession($session);
|
|
|
|
$this->query(Store::class)->setSession($session);
|
2014-07-16 17:40:22 +00:00
|
|
|
}
|
|
|
|
|
2016-05-11 09:23:25 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\Authentication\TwoFactorAuth\Manager
|
|
|
|
*/
|
|
|
|
public function getTwoFactorAuthManager() {
|
|
|
|
return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
|
|
|
|
}
|
|
|
|
|
2013-09-20 15:34:33 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\NavigationManager
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getNavigationManager() {
|
2013-09-20 15:34:33 +00:00
|
|
|
return $this->query('NavigationManager');
|
|
|
|
}
|
|
|
|
|
2013-09-20 18:21:24 +00:00
|
|
|
/**
|
2013-12-31 13:36:02 +00:00
|
|
|
* @return \OCP\IConfig
|
2013-09-20 18:21:24 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getConfig() {
|
2013-09-20 18:21:24 +00:00
|
|
|
return $this->query('AllConfig');
|
|
|
|
}
|
2013-09-23 22:09:21 +00:00
|
|
|
|
2014-11-27 15:40:12 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\SystemConfig
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getSystemConfig() {
|
2014-11-27 15:40:12 +00:00
|
|
|
return $this->query('SystemConfig');
|
|
|
|
}
|
|
|
|
|
2014-02-07 12:42:18 +00:00
|
|
|
/**
|
|
|
|
* Returns the app config manager
|
|
|
|
*
|
|
|
|
* @return \OCP\IAppConfig
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getAppConfig() {
|
2014-02-07 12:42:18 +00:00
|
|
|
return $this->query('AppConfig');
|
|
|
|
}
|
|
|
|
|
2015-08-27 11:14:50 +00:00
|
|
|
/**
|
|
|
|
* @return \OCP\L10N\IFactory
|
|
|
|
*/
|
|
|
|
public function getL10NFactory() {
|
|
|
|
return $this->query('L10NFactory');
|
|
|
|
}
|
|
|
|
|
2013-09-25 16:34:01 +00:00
|
|
|
/**
|
|
|
|
* get an L10N instance
|
2014-07-16 12:25:31 +00:00
|
|
|
*
|
2014-02-28 20:03:43 +00:00
|
|
|
* @param string $app appid
|
2014-08-31 08:05:59 +00:00
|
|
|
* @param string $lang
|
2016-04-14 13:38:00 +00:00
|
|
|
* @return IL10N
|
2013-09-25 16:34:01 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getL10N($app, $lang = null) {
|
2015-08-27 11:14:50 +00:00
|
|
|
return $this->getL10NFactory()->get($app, $lang);
|
2013-09-25 16:34:01 +00:00
|
|
|
}
|
|
|
|
|
2013-09-26 16:41:19 +00:00
|
|
|
/**
|
2014-05-06 23:55:06 +00:00
|
|
|
* @return \OCP\IURLGenerator
|
2013-09-26 16:41:19 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getURLGenerator() {
|
2013-09-26 16:41:19 +00:00
|
|
|
return $this->query('URLGenerator');
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2014-05-06 23:55:06 +00:00
|
|
|
* @return \OCP\IHelper
|
2013-09-26 16:41:19 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getHelper() {
|
2013-09-26 16:41:19 +00:00
|
|
|
return $this->query('AppHelper');
|
|
|
|
}
|
|
|
|
|
2016-10-31 10:07:54 +00:00
|
|
|
/**
|
|
|
|
* @return AppFetcher
|
|
|
|
*/
|
|
|
|
public function getAppFetcher() {
|
2017-05-10 07:56:38 +00:00
|
|
|
return $this->query(AppFetcher::class);
|
2016-10-31 10:07:54 +00:00
|
|
|
}
|
|
|
|
|
2013-09-17 15:46:33 +00:00
|
|
|
/**
|
2015-05-13 09:58:19 +00:00
|
|
|
* Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
|
|
|
|
* getMemCacheFactory() instead.
|
2013-09-17 15:46:33 +00:00
|
|
|
*
|
|
|
|
* @return \OCP\ICache
|
2015-05-13 09:58:19 +00:00
|
|
|
* @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
|
2013-09-17 15:46:33 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getCache() {
|
2015-06-15 15:54:48 +00:00
|
|
|
return $this->query('UserCache');
|
2013-09-17 15:46:33 +00:00
|
|
|
}
|
|
|
|
|
2014-01-06 11:55:56 +00:00
|
|
|
/**
|
2014-01-08 14:51:40 +00:00
|
|
|
* Returns an \OCP\CacheFactory instance
|
2014-01-06 11:55:56 +00:00
|
|
|
*
|
2014-03-24 13:55:03 +00:00
|
|
|
* @return \OCP\ICacheFactory
|
2014-01-06 11:55:56 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getMemCacheFactory() {
|
2014-01-08 14:18:12 +00:00
|
|
|
return $this->query('MemCacheFactory');
|
2014-01-06 11:55:56 +00:00
|
|
|
}
|
|
|
|
|
2016-04-14 13:41:04 +00:00
|
|
|
/**
|
|
|
|
* Returns an \OC\RedisFactory instance
|
|
|
|
*
|
|
|
|
* @return \OC\RedisFactory
|
|
|
|
*/
|
|
|
|
public function getGetRedisFactory() {
|
|
|
|
return $this->query('RedisFactory');
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-17 16:31:14 +00:00
|
|
|
/**
|
|
|
|
* Returns the current session
|
2013-09-20 12:33:45 +00:00
|
|
|
*
|
|
|
|
* @return \OCP\IDBConnection
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getDatabaseConnection() {
|
2014-09-10 11:24:49 +00:00
|
|
|
return $this->query('DatabaseConnection');
|
2013-09-20 12:33:45 +00:00
|
|
|
}
|
2013-09-29 18:31:12 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the activity manager
|
|
|
|
*
|
|
|
|
* @return \OCP\Activity\IManager
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getActivityManager() {
|
2013-09-29 18:31:12 +00:00
|
|
|
return $this->query('ActivityManager');
|
2013-09-20 12:33:45 +00:00
|
|
|
}
|
2014-02-11 13:00:24 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns an job list for controlling background jobs
|
|
|
|
*
|
|
|
|
* @return \OCP\BackgroundJob\IJobList
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getJobList() {
|
2014-02-11 13:00:24 +00:00
|
|
|
return $this->query('JobList');
|
|
|
|
}
|
2014-03-10 13:04:58 +00:00
|
|
|
|
2014-05-06 23:55:06 +00:00
|
|
|
/**
|
|
|
|
* Returns a logger instance
|
|
|
|
*
|
|
|
|
* @return \OCP\ILogger
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getLogger() {
|
2014-05-06 23:55:06 +00:00
|
|
|
return $this->query('Logger');
|
|
|
|
}
|
|
|
|
|
2014-03-10 13:04:58 +00:00
|
|
|
/**
|
|
|
|
* Returns a router for generating and matching urls
|
|
|
|
*
|
|
|
|
* @return \OCP\Route\IRouter
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getRouter() {
|
2014-03-24 13:55:03 +00:00
|
|
|
return $this->query('Router');
|
2014-03-10 13:04:58 +00:00
|
|
|
}
|
2014-04-19 17:30:12 +00:00
|
|
|
|
2014-06-05 23:17:02 +00:00
|
|
|
/**
|
|
|
|
* Returns a search instance
|
2014-07-16 12:25:31 +00:00
|
|
|
*
|
2014-06-05 23:17:02 +00:00
|
|
|
* @return \OCP\ISearch
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getSearch() {
|
2014-06-05 23:17:02 +00:00
|
|
|
return $this->query('Search');
|
|
|
|
}
|
2014-04-19 17:30:12 +00:00
|
|
|
|
2014-08-26 17:02:40 +00:00
|
|
|
/**
|
|
|
|
* Returns a SecureRandom instance
|
|
|
|
*
|
|
|
|
* @return \OCP\Security\ISecureRandom
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getSecureRandom() {
|
2014-08-26 17:02:40 +00:00
|
|
|
return $this->query('SecureRandom');
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a Crypto instance
|
|
|
|
*
|
|
|
|
* @return \OCP\Security\ICrypto
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getCrypto() {
|
2014-08-26 17:02:40 +00:00
|
|
|
return $this->query('Crypto');
|
|
|
|
}
|
|
|
|
|
2014-11-04 15:05:31 +00:00
|
|
|
/**
|
|
|
|
* Returns a Hasher instance
|
|
|
|
*
|
|
|
|
* @return \OCP\Security\IHasher
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getHasher() {
|
2014-11-04 15:05:31 +00:00
|
|
|
return $this->query('Hasher');
|
|
|
|
}
|
|
|
|
|
2015-08-24 15:13:16 +00:00
|
|
|
/**
|
|
|
|
* Returns a CredentialsManager instance
|
|
|
|
*
|
|
|
|
* @return \OCP\Security\ICredentialsManager
|
|
|
|
*/
|
|
|
|
public function getCredentialsManager() {
|
|
|
|
return $this->query('CredentialsManager');
|
|
|
|
}
|
|
|
|
|
2014-09-11 17:21:56 +00:00
|
|
|
/**
|
|
|
|
* Returns an instance of the HTTP helper class
|
2015-12-03 13:10:05 +00:00
|
|
|
*
|
2015-03-16 10:28:23 +00:00
|
|
|
* @deprecated Use getHTTPClientService()
|
2014-09-11 17:21:56 +00:00
|
|
|
* @return \OC\HTTPHelper
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getHTTPHelper() {
|
2014-09-11 17:21:56 +00:00
|
|
|
return $this->query('HTTPHelper');
|
|
|
|
}
|
|
|
|
|
2014-08-14 12:24:10 +00:00
|
|
|
/**
|
|
|
|
* Get the certificate manager for the user
|
|
|
|
*
|
2015-12-22 16:42:28 +00:00
|
|
|
* @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
|
2015-06-17 13:47:45 +00:00
|
|
|
* @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
|
2014-08-14 12:24:10 +00:00
|
|
|
*/
|
2015-12-22 16:42:28 +00:00
|
|
|
public function getCertificateManager($userId = '') {
|
|
|
|
if ($userId === '') {
|
2014-08-14 12:24:10 +00:00
|
|
|
$userSession = $this->getUserSession();
|
|
|
|
$user = $userSession->getUser();
|
|
|
|
if (is_null($user)) {
|
|
|
|
return null;
|
|
|
|
}
|
2015-06-19 08:23:04 +00:00
|
|
|
$userId = $user->getUID();
|
2014-08-14 12:24:10 +00:00
|
|
|
}
|
2017-05-19 20:51:26 +00:00
|
|
|
return new CertificateManager(
|
|
|
|
$userId,
|
|
|
|
new View(),
|
|
|
|
$this->getConfig(),
|
|
|
|
$this->getLogger(),
|
|
|
|
$this->getSecureRandom()
|
|
|
|
);
|
2014-08-14 12:24:10 +00:00
|
|
|
}
|
2014-08-29 15:19:38 +00:00
|
|
|
|
2015-03-16 10:28:23 +00:00
|
|
|
/**
|
|
|
|
* Returns an instance of the HTTP client service
|
|
|
|
*
|
|
|
|
* @return \OCP\Http\Client\IClientService
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getHTTPClientService() {
|
2015-03-16 10:28:23 +00:00
|
|
|
return $this->query('HttpClientService');
|
|
|
|
}
|
|
|
|
|
2014-08-29 15:19:38 +00:00
|
|
|
/**
|
2014-09-03 23:10:02 +00:00
|
|
|
* Create a new event source
|
2014-08-29 15:19:38 +00:00
|
|
|
*
|
|
|
|
* @return \OCP\IEventSource
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function createEventSource() {
|
2014-08-29 15:19:38 +00:00
|
|
|
return new \OC_EventSource();
|
|
|
|
}
|
2014-10-02 23:16:57 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the active event logger
|
|
|
|
*
|
|
|
|
* The returned logger only logs data when debug mode is enabled
|
|
|
|
*
|
2014-10-03 18:39:09 +00:00
|
|
|
* @return \OCP\Diagnostics\IEventLogger
|
2014-10-02 23:16:57 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getEventLogger() {
|
2014-10-02 23:16:57 +00:00
|
|
|
return $this->query('EventLogger');
|
|
|
|
}
|
2014-10-02 23:35:07 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the active query logger
|
|
|
|
*
|
|
|
|
* The returned logger only logs data when debug mode is enabled
|
|
|
|
*
|
2014-10-03 18:39:09 +00:00
|
|
|
* @return \OCP\Diagnostics\IQueryLogger
|
2014-10-02 23:35:07 +00:00
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getQueryLogger() {
|
2014-10-03 18:39:09 +00:00
|
|
|
return $this->query('QueryLogger');
|
2014-10-02 23:35:07 +00:00
|
|
|
}
|
2014-10-22 15:33:36 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the manager for temporary files and folders
|
|
|
|
*
|
|
|
|
* @return \OCP\ITempManager
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getTempManager() {
|
2014-10-22 15:33:36 +00:00
|
|
|
return $this->query('TempManager');
|
|
|
|
}
|
2014-11-07 13:26:12 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the app manager
|
|
|
|
*
|
|
|
|
* @return \OCP\App\IAppManager
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getAppManager() {
|
2014-11-07 13:26:12 +00:00
|
|
|
return $this->query('AppManager');
|
|
|
|
}
|
2014-11-27 13:36:11 +00:00
|
|
|
|
2015-02-12 12:53:27 +00:00
|
|
|
/**
|
|
|
|
* Creates a new mailer
|
|
|
|
*
|
|
|
|
* @return \OCP\Mail\IMailer
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getMailer() {
|
2015-02-12 12:53:27 +00:00
|
|
|
return $this->query('Mailer');
|
|
|
|
}
|
|
|
|
|
2014-11-27 13:36:11 +00:00
|
|
|
/**
|
|
|
|
* Get the webroot
|
|
|
|
*
|
|
|
|
* @return string
|
|
|
|
*/
|
2015-04-18 09:46:29 +00:00
|
|
|
public function getWebRoot() {
|
2014-11-27 13:50:14 +00:00
|
|
|
return $this->webRoot;
|
2014-11-27 13:36:11 +00:00
|
|
|
}
|
2014-11-24 14:54:42 +00:00
|
|
|
|
2015-03-30 13:58:20 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\OCSClient
|
|
|
|
*/
|
|
|
|
public function getOcsClient() {
|
|
|
|
return $this->query('OcsClient');
|
|
|
|
}
|
|
|
|
|
2014-11-24 15:37:04 +00:00
|
|
|
/**
|
2014-12-16 14:34:55 +00:00
|
|
|
* @return \OCP\IDateTimeZone
|
2014-11-24 15:37:04 +00:00
|
|
|
*/
|
2014-12-16 14:34:55 +00:00
|
|
|
public function getDateTimeZone() {
|
|
|
|
return $this->query('DateTimeZone');
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @return \OCP\IDateTimeFormatter
|
|
|
|
*/
|
|
|
|
public function getDateTimeFormatter() {
|
|
|
|
return $this->query('DateTimeFormatter');
|
2014-11-24 15:37:04 +00:00
|
|
|
}
|
|
|
|
|
2014-11-24 14:54:42 +00:00
|
|
|
/**
|
|
|
|
* @return \OCP\Files\Config\IMountProviderCollection
|
|
|
|
*/
|
2015-12-03 13:10:05 +00:00
|
|
|
public function getMountProviderCollection() {
|
2014-11-24 14:54:42 +00:00
|
|
|
return $this->query('MountConfigManager');
|
|
|
|
}
|
2014-12-05 18:56:29 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the IniWrapper
|
|
|
|
*
|
2014-12-05 18:57:06 +00:00
|
|
|
* @return IniGetWrapper
|
2014-12-05 18:56:29 +00:00
|
|
|
*/
|
|
|
|
public function getIniWrapper() {
|
2014-12-05 18:57:06 +00:00
|
|
|
return $this->query('IniWrapper');
|
2014-12-05 18:56:29 +00:00
|
|
|
}
|
2015-02-16 21:12:47 +00:00
|
|
|
|
2015-02-17 15:49:14 +00:00
|
|
|
/**
|
|
|
|
* @return \OCP\Command\IBus
|
|
|
|
*/
|
2015-12-03 13:10:05 +00:00
|
|
|
public function getCommandBus() {
|
2015-02-17 15:49:14 +00:00
|
|
|
return $this->query('AsyncCommandBus');
|
|
|
|
}
|
|
|
|
|
2015-02-16 21:12:47 +00:00
|
|
|
/**
|
|
|
|
* Get the trusted domain helper
|
|
|
|
*
|
|
|
|
* @return TrustedDomainHelper
|
|
|
|
*/
|
|
|
|
public function getTrustedDomainHelper() {
|
|
|
|
return $this->query('TrustedDomainHelper');
|
|
|
|
}
|
2015-05-04 12:02:27 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the locking provider
|
|
|
|
*
|
|
|
|
* @return \OCP\Lock\ILockingProvider
|
|
|
|
* @since 8.1.0
|
|
|
|
*/
|
|
|
|
public function getLockingProvider() {
|
|
|
|
return $this->query('LockingProvider');
|
|
|
|
}
|
2015-07-01 13:57:04 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @return \OCP\Files\Mount\IMountManager
|
|
|
|
**/
|
|
|
|
function getMountManager() {
|
|
|
|
return $this->query('MountManager');
|
|
|
|
}
|
2015-04-09 13:19:57 +00:00
|
|
|
|
2016-08-15 11:38:02 +00:00
|
|
|
/** @return \OCP\Files\Config\IUserMountCache */
|
|
|
|
function getUserMountCache() {
|
|
|
|
return $this->query('UserMountCache');
|
|
|
|
}
|
|
|
|
|
2016-05-03 08:30:07 +00:00
|
|
|
/**
|
2015-04-09 13:19:57 +00:00
|
|
|
* Get the MimeTypeDetector
|
|
|
|
*
|
|
|
|
* @return \OCP\Files\IMimeTypeDetector
|
|
|
|
*/
|
|
|
|
public function getMimeTypeDetector() {
|
|
|
|
return $this->query('MimeTypeDetector');
|
|
|
|
}
|
2015-03-21 19:03:56 +00:00
|
|
|
|
2015-09-03 18:48:42 +00:00
|
|
|
/**
|
|
|
|
* Get the MimeTypeLoader
|
|
|
|
*
|
|
|
|
* @return \OCP\Files\IMimeTypeLoader
|
|
|
|
*/
|
|
|
|
public function getMimeTypeLoader() {
|
|
|
|
return $this->query('MimeTypeLoader');
|
|
|
|
}
|
|
|
|
|
2015-03-21 19:03:56 +00:00
|
|
|
/**
|
|
|
|
* Get the manager of all the capabilities
|
|
|
|
*
|
2015-07-22 11:04:56 +00:00
|
|
|
* @return \OC\CapabilitiesManager
|
2015-03-21 19:03:56 +00:00
|
|
|
*/
|
|
|
|
public function getCapabilitiesManager() {
|
|
|
|
return $this->query('CapabilitiesManager');
|
|
|
|
}
|
2015-08-14 13:40:15 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the EventDispatcher
|
|
|
|
*
|
|
|
|
* @return EventDispatcherInterface
|
|
|
|
* @since 8.2.0
|
|
|
|
*/
|
|
|
|
public function getEventDispatcher() {
|
|
|
|
return $this->query('EventDispatcher');
|
|
|
|
}
|
2015-08-21 16:27:52 +00:00
|
|
|
|
2015-08-31 10:24:37 +00:00
|
|
|
/**
|
|
|
|
* Get the Notification Manager
|
|
|
|
*
|
2016-01-14 13:35:24 +00:00
|
|
|
* @return \OCP\Notification\IManager
|
2015-08-31 10:24:37 +00:00
|
|
|
* @since 8.2.0
|
|
|
|
*/
|
|
|
|
public function getNotificationManager() {
|
|
|
|
return $this->query('NotificationManager');
|
|
|
|
}
|
|
|
|
|
2015-12-03 15:35:57 +00:00
|
|
|
/**
|
|
|
|
* @return \OCP\Comments\ICommentsManager
|
|
|
|
*/
|
2015-11-23 22:53:55 +00:00
|
|
|
public function getCommentsManager() {
|
|
|
|
return $this->query('CommentsManager');
|
|
|
|
}
|
|
|
|
|
2016-06-21 19:21:46 +00:00
|
|
|
/**
|
2017-04-07 12:51:05 +00:00
|
|
|
* @return \OCA\Theming\ThemingDefaults
|
2016-06-21 19:21:46 +00:00
|
|
|
*/
|
|
|
|
public function getThemingDefaults() {
|
|
|
|
return $this->query('ThemingDefaults');
|
|
|
|
}
|
|
|
|
|
Add code integrity check
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-11-03 19:26:06 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\IntegrityCheck\Checker
|
|
|
|
*/
|
|
|
|
public function getIntegrityCodeChecker() {
|
|
|
|
return $this->query('IntegrityCodeChecker');
|
|
|
|
}
|
|
|
|
|
2015-08-21 16:27:52 +00:00
|
|
|
/**
|
|
|
|
* @return \OC\Session\CryptoWrapper
|
|
|
|
*/
|
|
|
|
public function getSessionCryptoWrapper() {
|
|
|
|
return $this->query('CryptoWrapper');
|
|
|
|
}
|
2015-08-31 14:18:26 +00:00
|
|
|
|
2016-01-25 16:15:54 +00:00
|
|
|
/**
|
|
|
|
* @return CsrfTokenManager
|
|
|
|
*/
|
|
|
|
public function getCsrfTokenManager() {
|
|
|
|
return $this->query('CsrfTokenManager');
|
|
|
|
}
|
|
|
|
|
2016-07-20 16:36:15 +00:00
|
|
|
/**
|
|
|
|
* @return Throttler
|
|
|
|
*/
|
|
|
|
public function getBruteForceThrottler() {
|
|
|
|
return $this->query('Throttler');
|
|
|
|
}
|
|
|
|
|
2016-01-28 13:33:02 +00:00
|
|
|
/**
|
|
|
|
* @return IContentSecurityPolicyManager
|
|
|
|
*/
|
|
|
|
public function getContentSecurityPolicyManager() {
|
|
|
|
return $this->query('ContentSecurityPolicyManager');
|
|
|
|
}
|
|
|
|
|
2016-10-24 14:31:06 +00:00
|
|
|
/**
|
|
|
|
* @return ContentSecurityPolicyNonceManager
|
|
|
|
*/
|
|
|
|
public function getContentSecurityPolicyNonceManager() {
|
|
|
|
return $this->query('ContentSecurityPolicyNonceManager');
|
|
|
|
}
|
|
|
|
|
2015-08-31 14:18:26 +00:00
|
|
|
/**
|
|
|
|
* Not a public API as of 8.2, wait for 9.0
|
2015-12-03 13:10:05 +00:00
|
|
|
*
|
2015-08-31 14:18:26 +00:00
|
|
|
* @return \OCA\Files_External\Service\BackendService
|
|
|
|
*/
|
|
|
|
public function getStoragesBackendService() {
|
2016-08-18 09:56:19 +00:00
|
|
|
return $this->query('OCA\\Files_External\\Service\\BackendService');
|
2015-08-31 14:18:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Not a public API as of 8.2, wait for 9.0
|
2015-12-03 13:10:05 +00:00
|
|
|
*
|
2015-08-31 14:18:26 +00:00
|
|
|
* @return \OCA\Files_External\Service\GlobalStoragesService
|
|
|
|
*/
|
|
|
|
public function getGlobalStoragesService() {
|
2016-08-18 09:56:19 +00:00
|
|
|
return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService');
|
2015-08-31 14:18:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Not a public API as of 8.2, wait for 9.0
|
2015-12-03 13:10:05 +00:00
|
|
|
*
|
2015-08-31 14:18:26 +00:00
|
|
|
* @return \OCA\Files_External\Service\UserGlobalStoragesService
|
|
|
|
*/
|
|
|
|
public function getUserGlobalStoragesService() {
|
2016-08-18 09:56:19 +00:00
|
|
|
return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
|
2015-08-31 14:18:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Not a public API as of 8.2, wait for 9.0
|
2015-12-03 13:10:05 +00:00
|
|
|
*
|
2015-08-31 14:18:26 +00:00
|
|
|
* @return \OCA\Files_External\Service\UserStoragesService
|
|
|
|
*/
|
|
|
|
public function getUserStoragesService() {
|
2016-08-18 09:56:19 +00:00
|
|
|
return $this->query('OCA\\Files_External\\Service\\UserStoragesService');
|
2015-08-31 14:18:26 +00:00
|
|
|
}
|
2016-01-11 09:30:03 +00:00
|
|
|
|
|
|
|
/**
|
2016-01-27 13:48:52 +00:00
|
|
|
* @return \OCP\Share\IManager
|
2016-01-11 09:30:03 +00:00
|
|
|
*/
|
|
|
|
public function getShareManager() {
|
|
|
|
return $this->query('ShareManager');
|
|
|
|
}
|
2015-12-03 13:10:05 +00:00
|
|
|
|
2016-07-22 08:46:29 +00:00
|
|
|
/**
|
|
|
|
* Returns the LDAP Provider
|
|
|
|
*
|
|
|
|
* @return \OCP\LDAP\ILDAPProvider
|
|
|
|
*/
|
|
|
|
public function getLDAPProvider() {
|
|
|
|
return $this->query('LDAPProvider');
|
|
|
|
}
|
2016-08-08 21:31:26 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @return \OCP\Settings\IManager
|
|
|
|
*/
|
|
|
|
public function getSettingsManager() {
|
|
|
|
return $this->query('SettingsManager');
|
|
|
|
}
|
2016-08-24 10:03:22 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @return \OCP\Files\IAppData
|
|
|
|
*/
|
|
|
|
public function getAppDataDir($app) {
|
|
|
|
/** @var \OC\Files\AppData\Factory $factory */
|
|
|
|
$factory = $this->query(\OC\Files\AppData\Factory::class);
|
|
|
|
return $factory->get($app);
|
|
|
|
}
|
2016-08-01 16:27:07 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @return \OCP\Lockdown\ILockdownManager
|
|
|
|
*/
|
|
|
|
public function getLockdownManager() {
|
|
|
|
return $this->query('LockdownManager');
|
|
|
|
}
|
2017-01-27 11:52:17 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @return \OCP\Federation\ICloudIdManager
|
|
|
|
*/
|
|
|
|
public function getCloudIdManager() {
|
|
|
|
return $this->query(ICloudIdManager::class);
|
|
|
|
}
|
2013-08-20 22:58:15 +00:00
|
|
|
}
|