Remove the listener plugin

diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php
index 64c074fb54486558de5e39f15b9f66439578ab34..6ddb570aca8cd0ed6495b45388dbc44ccdb2bc79 100644 (file)
--- a/apps/dav/appinfo/v1/publicwebdav.php
+++ b/apps/dav/appinfo/v1/publicwebdav.php
@@ -41,7 +41,6 @@ $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
        \OC::$server->getUserSession(),
        \OC::$server->getMountManager(),
        \OC::$server->getTagManager(),
-       \OC::$server->getEventDispatcher(),
        \OC::$server->getRequest()
 );
 

diff --git a/apps/dav/appinfo/v1/webdav.php b/apps/dav/appinfo/v1/webdav.php
index e48ae7c5074afefb3491130efc15b8e4e509d3eb..d75c3526bdd38dea778d5fe7a9ce203e8aca3234 100644 (file)
--- a/apps/dav/appinfo/v1/webdav.php
+++ b/apps/dav/appinfo/v1/webdav.php
@@ -34,7 +34,6 @@ $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
        \OC::$server->getUserSession(),
        \OC::$server->getMountManager(),
        \OC::$server->getTagManager(),
-       \OC::$server->getEventDispatcher(),
        \OC::$server->getRequest()
 );
 

diff --git a/apps/dav/lib/connector/sabre/listenerplugin.php b/apps/dav/lib/connector/sabre/listenerplugin.php
deleted file mode 100644 (file)
index 87abd0d..0000000
--- a/apps/dav/lib/connector/sabre/listenerplugin.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Roeland Jago Douma <rullzer@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @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/>
- *
- */
-
-namespace OCA\DAV\Connector\Sabre;
-
-use OCP\AppFramework\Http;
-use OCP\SabrePluginEvent;
-use OCP\SabrePluginException;
-use Sabre\DAV\ServerPlugin;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-class ListenerPlugin extends ServerPlugin {
-       /** @var EventDispatcherInterface */
-       protected $dispatcher;
-
-       /**
-        * @param EventDispatcherInterface $dispatcher
-        */
-       public function __construct(EventDispatcherInterface $dispatcher) {
-               $this->dispatcher = $dispatcher;
-       }
-
-       /**
-        * This initialize the plugin
-        *
-        * @param \Sabre\DAV\Server $server
-        */
-       public function initialize(\Sabre\DAV\Server $server) {
-               $server->on('beforeMethod', array($this, 'emitListener'), 15);
-       }
-
-       /**
-        * This method is called before any HTTP method and returns http status code 503
-        * in case the system is in maintenance mode.
-        *
-        * @return bool
-        * @throws \Exception
-        */
-       public function emitListener() {
-               $event = new SabrePluginEvent();
-
-               $this->dispatcher->dispatch('OCA\DAV\Connector\Sabre::beforeMethod', $event);
-
-               if ($event->getStatusCode() !== Http::STATUS_OK) {
-                       throw new SabrePluginException($event->getMessage(), $event->getStatusCode());
-               }
-
-               return true;
-       }
-}

diff --git a/apps/dav/lib/connector/sabre/serverfactory.php b/apps/dav/lib/connector/sabre/serverfactory.php
index c8c4a05b458aaf3e356b2e64d561e55f0dda5ca8..88e7e9a545fe37663bbd550d388520b357b8da23 100644 (file)
--- a/apps/dav/lib/connector/sabre/serverfactory.php
+++ b/apps/dav/lib/connector/sabre/serverfactory.php
@@ -32,8 +32,6 @@ use OCP\IRequest;
 use OCP\ITagManager;
 use OCP\IUserSession;
 use Sabre\DAV\Auth\Backend\BackendInterface;
-use Sabre\DAV\Locks\Plugin;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class ServerFactory {
        /** @var IConfig */
@@ -48,8 +46,6 @@ class ServerFactory {
        private $mountManager;
        /** @var ITagManager */
        private $tagManager;
-       /** @var EventDispatcherInterface */
-       private $dispatcher;
        /** @var IRequest */
        private $request;
 
@@ -60,7 +56,6 @@ class ServerFactory {
         * @param IUserSession $userSession
         * @param IMountManager $mountManager
         * @param ITagManager $tagManager
-        * @param EventDispatcherInterface $dispatcher
         * @param IRequest $request
         */
        public function __construct(
@@ -70,7 +65,6 @@ class ServerFactory {
                IUserSession $userSession,
                IMountManager $mountManager,
                ITagManager $tagManager,
-               EventDispatcherInterface $dispatcher,
                IRequest $request
        ) {
                $this->config = $config;
@@ -79,7 +73,6 @@ class ServerFactory {
                $this->userSession = $userSession;
                $this->mountManager = $mountManager;
                $this->tagManager = $tagManager;
-               $this->dispatcher = $dispatcher;
                $this->request = $request;
        }
 
@@ -110,7 +103,6 @@ class ServerFactory {
                $server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
                $server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
                $server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-               $server->addPlugin(new \OCA\DAV\Connector\Sabre\ListenerPlugin($this->dispatcher));
                // Finder on OS X requires Class 2 WebDAV support (locking), since we do
                // not provide locking we emulate it using a fake locking plugin.
                if($this->request->isUserAgent(['/WebDAVFS/'])) {

diff --git a/apps/dav/lib/server.php b/apps/dav/lib/server.php
index a4d07d5e08e430b9344e21aa46c122b37c110af6..80a1309b9474791a0e357b367eb3df31f4b8df5c 100644 (file)
--- a/apps/dav/lib/server.php
+++ b/apps/dav/lib/server.php
@@ -40,7 +40,6 @@ class Server {
                $this->request = $request;
                $this->baseUri = $baseUri;
                $logger = \OC::$server->getLogger();
-               $dispatcher = \OC::$server->getEventDispatcher();
                $mailer = \OC::$server->getMailer();
 
                $root = new RootCollection();
@@ -67,7 +66,6 @@ class Server {
                $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
                $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
                $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-               $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ListenerPlugin($dispatcher));
                $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 
                // acl

diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php b/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php
index 764981e3717dc564dbb92e38ebd46c18d12cc34c..e3cdca5abfa596d535123f3f052534e62c4abc6a 100644 (file)
--- a/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php
+++ b/apps/dav/tests/unit/connector/sabre/requesttest/requesttest.php
@@ -62,7 +62,6 @@ abstract class RequestTest extends TestCase {
                        \OC::$server->getUserSession(),
                        \OC::$server->getMountManager(),
                        \OC::$server->getTagManager(),
-                       \OC::$server->getEventDispatcher(),
                        $this->getMock('\OCP\IRequest')
                );
        }