aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-04-12 21:27:40 +0200
committerLukas Reschke <lukas@statuscode.ch>2017-04-13 12:00:16 +0200
commitd729bde98c85207efdcae39429603d9226b13f4e (patch)
tree891c6bb284b890c2ae0ddb742b5b668038ec4422
parent66835476b59b8be7593d4cfa03a51c4f265d7e26 (diff)
downloadnextcloud-server-d729bde98c85207efdcae39429603d9226b13f4e.tar.gz
nextcloud-server-d729bde98c85207efdcae39429603d9226b13f4e.zip
Register in ServerContainer
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
-rw-r--r--lib/private/AppFramework/DependencyInjection/DIContainer.php18
-rw-r--r--lib/private/Server.php15
2 files changed, 15 insertions, 18 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index a414772c4d6..588f52e452c 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -53,13 +53,11 @@ use OCP\AppFramework\QueryException;
use OCP\Files\Folder;
use OCP\Files\IAppData;
use OCP\IL10N;
-use OCP\IMemcache;
use OCP\IRequest;
use OCP\IServerContainer;
use OCP\IUserSession;
use OCP\RichObjectStrings\IValidator;
use OCP\Util;
-use SearchDAV\XML\Limit;
class DIContainer extends SimpleContainer implements IAppContainer {
@@ -164,22 +162,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $c->query(Validator::class);
});
- $this->registerService(OC\Security\RateLimiting\Limiter::class, function($c) {
- return new OC\Security\RateLimiting\Limiter(
- $this->getServer()->getUserSession(),
- $this->getServer()->getRequest(),
- new OC\AppFramework\Utility\TimeFactory(),
- $c->query(OC\Security\RateLimiting\Backend\IBackend::class)
- );
- });
-
- $this->registerService(OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
- return new OC\Security\RateLimiting\Backend\MemoryCache(
- $this->getServer()->getMemCacheFactory(),
- new OC\AppFramework\Utility\TimeFactory()
- );
- });
-
$this->registerService(\OC\Security\IdentityProof\Manager::class, function ($c) {
return new \OC\Security\IdentityProof\Manager(
$this->getServer()->getAppDataDir('identityproof'),
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 00698a04f89..2aa7c15af00 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -516,6 +516,21 @@ class Server extends ServerContainer implements IServerContainer {
});
$this->registerAlias('Search', \OCP\ISearch::class);
+ $this->registerService(\OC\Security\RateLimiting\Limiter::class, function($c) {
+ return new \OC\Security\RateLimiting\Limiter(
+ $this->getUserSession(),
+ $this->getRequest(),
+ new \OC\AppFramework\Utility\TimeFactory(),
+ $c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
+ );
+ });
+ $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
+ return new \OC\Security\RateLimiting\Backend\MemoryCache(
+ $this->getMemCacheFactory(),
+ new \OC\AppFramework\Utility\TimeFactory()
+ );
+ });
+
$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
return new SecureRandom();
});