mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #464 from nextcloud/master-change-load-order 

[master] Change load order of auth backends so that we can throw an exception …
This commit is contained in:
Roeland Douma 2016-07-20 20:08:22 +02:00 committed by GitHub
parent ffc345b141 e795f7b106
commit 26cf51403e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/dav/lib/Server.php
View File

@ -72,13 +72,16 @@ class Server {
$this->server->setBaseUri($this->baseUri); $this->server->setBaseUri($this->baseUri);
$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig())); $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
$authPlugin = new Plugin($authBackend, 'ownCloud'); $authPlugin = new Plugin();
$this->server->addPlugin($authPlugin); $this->server->addPlugin($authPlugin);
// allow setup of additional auth backends // allow setup of additional auth backends
$event = new SabrePluginEvent($this->server); $event = new SabrePluginEvent($this->server);
$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event); $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
// because we are throwing exceptions this plugin has to be the last one
$authPlugin->addBackend($authBackend);
// debugging // debugging
if(\OC::$server->getConfig()->getSystemValue('debug', false)) { if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin()); $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());