Remove the listener plugin
This commit is contained in:
parent
a11f6093b7
commit
3bdcfef395
|
@ -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()
|
||||
);
|
||||
|
||||
|
|
|
@ -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()
|
||||
);
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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/'])) {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue