summaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
authorThomas Müller <DeepDiver1975@users.noreply.github.com>2016-07-14 16:19:31 +0200
committerLukas Reschke <lukas@statuscode.ch>2016-07-20 14:40:52 +0200
commite795f7b1066782205f2c5b5482dc9535088d8d98 (patch)
tree5188245de87a2f7ab00d8c95f94319b44e78783b /apps/dav
parentf414c664f281ad14ed2b0e976ea73238d895457d (diff)
downloadnextcloud-server-e795f7b1066782205f2c5b5482dc9535088d8d98.tar.gz
nextcloud-server-e795f7b1066782205f2c5b5482dc9535088d8d98.zip
Change load order of auth backends so that we can throw an exception in OCA\DAV\Connector\Sabre\Auth - fixes #25362 (#25476)
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/lib/Server.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index 0715d39049c..73a07072d3c 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -72,13 +72,16 @@ class Server {
$this->server->setBaseUri($this->baseUri);
$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
- $authPlugin = new Plugin($authBackend, 'ownCloud');
+ $authPlugin = new Plugin();
$this->server->addPlugin($authPlugin);
// allow setup of additional auth backends
$event = new SabrePluginEvent($this->server);
$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
if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());