From 01413281db80ecaf8cd1436ad38d35160643d1d4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 22 May 2018 13:40:54 +0200 Subject: [PATCH 1/5] Add sabre plugin to allow anonymous options requests to the dav root Signed-off-by: Robin Appelman --- .../composer/composer/autoload_classmap.php | 1 + .../dav/composer/composer/autoload_static.php | 1 + .../Sabre/AnonymousOptionsPlugin.php | 63 +++++++++++++++++++ .../dav/lib/Connector/Sabre/ServerFactory.php | 1 + apps/dav/lib/Server.php | 2 + 5 files changed, 68 insertions(+) create mode 100644 apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php index d15268f8c3394..b5e51d145d411 100644 --- a/apps/dav/composer/composer/autoload_classmap.php +++ b/apps/dav/composer/composer/autoload_classmap.php @@ -74,6 +74,7 @@ 'OCA\\DAV\\Comments\\RootCollection' => $baseDir . '/../lib/Comments/RootCollection.php', 'OCA\\DAV\\Connector\\LegacyDAVACL' => $baseDir . '/../lib/Connector/LegacyDAVACL.php', 'OCA\\DAV\\Connector\\PublicAuth' => $baseDir . '/../lib/Connector/PublicAuth.php', + 'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => $baseDir . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php', 'OCA\\DAV\\Connector\\Sabre\\AppEnabledPlugin' => $baseDir . '/../lib/Connector/Sabre/AppEnabledPlugin.php', 'OCA\\DAV\\Connector\\Sabre\\Auth' => $baseDir . '/../lib/Connector/Sabre/Auth.php', 'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => $baseDir . '/../lib/Connector/Sabre/BearerAuth.php', diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php index 00a930ff6f710..af1ca3d93b530 100644 --- a/apps/dav/composer/composer/autoload_static.php +++ b/apps/dav/composer/composer/autoload_static.php @@ -89,6 +89,7 @@ class ComposerStaticInitDAV 'OCA\\DAV\\Comments\\RootCollection' => __DIR__ . '/..' . '/../lib/Comments/RootCollection.php', 'OCA\\DAV\\Connector\\LegacyDAVACL' => __DIR__ . '/..' . '/../lib/Connector/LegacyDAVACL.php', 'OCA\\DAV\\Connector\\PublicAuth' => __DIR__ . '/..' . '/../lib/Connector/PublicAuth.php', + 'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php', 'OCA\\DAV\\Connector\\Sabre\\AppEnabledPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AppEnabledPlugin.php', 'OCA\\DAV\\Connector\\Sabre\\Auth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Auth.php', 'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/BearerAuth.php', diff --git a/apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php b/apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php new file mode 100644 index 0000000000000..cefa0d5a19afe --- /dev/null +++ b/apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php @@ -0,0 +1,63 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 + * along with this program. If not, see . + * + */ + +namespace OCA\DAV\Connector\Sabre; + +use Sabre\DAV\CorePlugin; +use Sabre\DAV\FS\Directory; +use Sabre\DAV\ServerPlugin; +use Sabre\DAV\Tree; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; + +class AnonymousOptionsPlugin extends ServerPlugin { + + /** + * @var \Sabre\DAV\Server + */ + private $server; + + /** + * @param \Sabre\DAV\Server $server + * @return void + */ + public function initialize(\Sabre\DAV\Server $server) { + $this->server = $server; + // before auth + $this->server->on('beforeMethod', [$this, 'handleAnonymousOptions'], 9); + } + + /** + * @throws \Sabre\DAV\Exception\Forbidden + * @return bool + */ + public function handleAnonymousOptions(RequestInterface $request, ResponseInterface $response) { + if ($request->getMethod() === 'OPTIONS' && $request->getPath() === '') { + /** @var CorePlugin $corePlugin */ + $corePlugin = $this->server->getPlugin('core'); + // setup a fake tree for anonymous access + $this->server->tree = new Tree(new Directory('')); + $corePlugin->httpOptions($request, $response); + $this->server->sapi->sendResponse($response); + return false; + } + } +} diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php index 8488093ccad57..dff1aab0d556a 100644 --- a/apps/dav/lib/Connector/Sabre/ServerFactory.php +++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php @@ -111,6 +111,7 @@ public function createServer($baseUri, // Load plugins $server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config)); $server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config)); + $server->addPlugin(new \OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin()); $server->addPlugin($authPlugin); // FIXME: The following line is a workaround for legacy components relying on being able to send a GET to / $server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin()); diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 2615e37be4e31..7aae79e21010c 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -54,6 +54,7 @@ use OCA\DAV\DAV\CustomPropertiesBackend; use OCA\DAV\Connector\Sabre\QuotaPlugin; use OCA\DAV\Files\BrowserErrorPagePlugin; +use OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin; use OCA\DAV\SystemTag\SystemTagPlugin; use OCA\DAV\Upload\ChunkingPlugin; use OCP\IRequest; @@ -101,6 +102,7 @@ public function __construct(IRequest $request, $baseUri) { $this->server->setBaseUri($this->baseUri); $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig())); + $this->server->addPlugin(new AnonymousOptionsPlugin()); $authPlugin = new Plugin(); $authPlugin->addBackend(new PublicAuth()); $this->server->addPlugin($authPlugin); From 01eb420a1e6f06a1089ad45fb9102ddf39c23533 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 1 Jun 2018 17:22:21 +0200 Subject: [PATCH 2/5] Add tests for handling anonymous auth Signed-off-by: Robin Appelman --- .../tests/unit/DAV/AnonymousOptionsTest.php | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 apps/dav/tests/unit/DAV/AnonymousOptionsTest.php diff --git a/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php b/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php new file mode 100644 index 0000000000000..4e440e6644b38 --- /dev/null +++ b/apps/dav/tests/unit/DAV/AnonymousOptionsTest.php @@ -0,0 +1,71 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 + * along with this program. If not, see . + * + */ + +namespace OCA\DAV\tests\unit\DAV; + +use OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin; +use Sabre\DAV\Auth\Backend\BasicCallBack; +use Sabre\DAV\Auth\Plugin; +use Sabre\DAV\Server; +use Sabre\HTTP\ResponseInterface; +use Sabre\HTTP\Sapi; +use Test\TestCase; + +class AnonymousOptionsTest extends TestCase { + private function sendRequest($method, $path) { + $server = new Server(); + $server->addPlugin(new AnonymousOptionsPlugin()); + $server->addPlugin(new Plugin(new BasicCallBack(function() { + return false; + }))); + + $server->httpRequest->setMethod($method); + $server->httpRequest->setUrl($path); + + $server->sapi = new SapiMock(); + $server->exec(); + return $server->httpResponse; + } + + public function testAnonymousOptionsRoot() { + $response = $this->sendRequest('OPTIONS', ''); + + $this->assertEquals(200, $response->getStatus()); + } + + public function testAnonymousOptionsNonRoot() { + $response = $this->sendRequest('OPTIONS', 'foo'); + + $this->assertEquals(401, $response->getStatus()); + } +} + +class SapiMock extends Sapi { + /** + * Overriding this so nothing is ever echo'd. + * + * @return void + */ + static function sendResponse(ResponseInterface $response) { + + } + +} From 821d658ec357c167e37760fc8c099e00a24d6dd3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 28 Jun 2018 14:53:44 +0200 Subject: [PATCH 3/5] Fix search related results in OPTIONS requests Signed-off-by: Robin Appelman --- .../composer/composer/autoload_classmap.php | 1 + .../dav/composer/composer/autoload_static.php | 1 + .../Sabre/AnonymousOptionsPlugin.php | 3 + apps/dav/lib/Files/LazySearchBackend.php | 72 +++++++++++++++++++ apps/dav/lib/Server.php | 10 ++- 5 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 apps/dav/lib/Files/LazySearchBackend.php diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php index b5e51d145d411..97687f5ea4997 100644 --- a/apps/dav/composer/composer/autoload_classmap.php +++ b/apps/dav/composer/composer/autoload_classmap.php @@ -123,6 +123,7 @@ 'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => $baseDir . '/../lib/Files/BrowserErrorPagePlugin.php', 'OCA\\DAV\\Files\\FileSearchBackend' => $baseDir . '/../lib/Files/FileSearchBackend.php', 'OCA\\DAV\\Files\\FilesHome' => $baseDir . '/../lib/Files/FilesHome.php', + 'OCA\\DAV\\Files\\LazySearchBackend' => $baseDir . '/../lib/Files/LazySearchBackend.php', 'OCA\\DAV\\Files\\RootCollection' => $baseDir . '/../lib/Files/RootCollection.php', 'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => $baseDir . '/../lib/Files/Sharing/FilesDropPlugin.php', 'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => $baseDir . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php', diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php index af1ca3d93b530..f989b036900c9 100644 --- a/apps/dav/composer/composer/autoload_static.php +++ b/apps/dav/composer/composer/autoload_static.php @@ -138,6 +138,7 @@ class ComposerStaticInitDAV 'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => __DIR__ . '/..' . '/../lib/Files/BrowserErrorPagePlugin.php', 'OCA\\DAV\\Files\\FileSearchBackend' => __DIR__ . '/..' . '/../lib/Files/FileSearchBackend.php', 'OCA\\DAV\\Files\\FilesHome' => __DIR__ . '/..' . '/../lib/Files/FilesHome.php', + 'OCA\\DAV\\Files\\LazySearchBackend' => __DIR__ . '/..' . '/../lib/Files/LazySearchBackend.php', 'OCA\\DAV\\Files\\RootCollection' => __DIR__ . '/..' . '/../lib/Files/RootCollection.php', 'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/FilesDropPlugin.php', 'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php', diff --git a/apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php b/apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php index cefa0d5a19afe..7a62f706378f0 100644 --- a/apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php +++ b/apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php @@ -56,6 +56,9 @@ public function handleAnonymousOptions(RequestInterface $request, ResponseInterf // setup a fake tree for anonymous access $this->server->tree = new Tree(new Directory('')); $corePlugin->httpOptions($request, $response); + $this->server->emit('afterMethod', [$request, $response]); + $this->server->emit('afterMethod:OPTIONS', [$request, $response]); + $this->server->sapi->sendResponse($response); return false; } diff --git a/apps/dav/lib/Files/LazySearchBackend.php b/apps/dav/lib/Files/LazySearchBackend.php new file mode 100644 index 0000000000000..6369046ae1035 --- /dev/null +++ b/apps/dav/lib/Files/LazySearchBackend.php @@ -0,0 +1,72 @@ + + * + * @author Robin Appelman + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 + * along with this program. If not, see . + * + */ + +namespace OCA\DAV\Files; + +use SearchDAV\Backend\ISearchBackend; +use SearchDAV\Query\Query; + +class LazySearchBackend implements ISearchBackend { + /** + * @var ISearchBackend $backend + */ + private $backend = null; + + public function setBackend(ISearchBackend $backend) { + $this->backend = $backend; + } + + public function getArbiterPath() { + if ($this->backend) { + return $this->backend->getArbiterPath(); + } else { + return ''; + } + } + + public function isValidScope($href, $depth, $path) { + if ($this->backend) { + return $this->backend->getArbiterPath(); + } else { + return false; + } + } + + public function getPropertyDefinitionsForScope($href, $path) { + if ($this->backend) { + return $this->backend->getArbiterPath(); + } else { + return []; + } + } + + public function search(Query $query) { + if ($this->backend) { + return $this->backend->getArbiterPath(); + } else { + return []; + } + } + + +} diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 7aae79e21010c..a9cbfca7144ed 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -55,6 +55,7 @@ use OCA\DAV\Connector\Sabre\QuotaPlugin; use OCA\DAV\Files\BrowserErrorPagePlugin; use OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin; +use OCA\DAV\Files\LazySearchBackend; use OCA\DAV\SystemTag\SystemTagPlugin; use OCA\DAV\Upload\ChunkingPlugin; use OCP\IRequest; @@ -197,8 +198,11 @@ public function __construct(IRequest $request, $baseUri) { $this->server->addPlugin(new BrowserErrorPagePlugin()); } + $lazySearchBackend = new LazySearchBackend(); + $this->server->addPlugin(new SearchPlugin($lazySearchBackend)); + // wait with registering these until auth is handled and the filesystem is setup - $this->server->on('beforeMethod', function () use ($root) { + $this->server->on('beforeMethod', function () use ($root, $lazySearchBackend) { // custom properties plugin must be the last one $userSession = \OC::$server->getUserSession(); $user = $userSession->getUser(); @@ -257,13 +261,13 @@ public function __construct(IRequest $request, $baseUri) { \OC::$server->getGroupManager(), $userFolder )); - $this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend( + $lazySearchBackend->setBackend(new \OCA\DAV\Files\FileSearchBackend( $this->server->tree, $user, \OC::$server->getRootFolder(), \OC::$server->getShareManager(), $view - ))); + )); } $this->server->addPlugin(new \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin( \OC::$server->getConfig(), From 94a367910ee7c6ea8ea21f494b08e48cc8923321 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 2 Jul 2018 13:42:41 +0200 Subject: [PATCH 4/5] Fix lazy search backend Signed-off-by: Robin Appelman --- apps/dav/lib/Files/LazySearchBackend.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dav/lib/Files/LazySearchBackend.php b/apps/dav/lib/Files/LazySearchBackend.php index 6369046ae1035..dc7fec607a4a5 100644 --- a/apps/dav/lib/Files/LazySearchBackend.php +++ b/apps/dav/lib/Files/LazySearchBackend.php @@ -54,7 +54,7 @@ public function isValidScope($href, $depth, $path) { public function getPropertyDefinitionsForScope($href, $path) { if ($this->backend) { - return $this->backend->getArbiterPath(); + return $this->backend->getPropertyDefinitionsForScope($href, $path); } else { return []; } @@ -62,7 +62,7 @@ public function getPropertyDefinitionsForScope($href, $path) { public function search(Query $query) { if ($this->backend) { - return $this->backend->getArbiterPath(); + return $this->backend->search($query); } else { return []; } From 1a1b7b1d3305de74994d96e2978fd993f0689b16 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 18 Jul 2018 16:01:56 +0200 Subject: [PATCH 5/5] adjust to older library version Signed-off-by: Robin Appelman --- apps/dav/lib/Files/LazySearchBackend.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dav/lib/Files/LazySearchBackend.php b/apps/dav/lib/Files/LazySearchBackend.php index dc7fec607a4a5..0d576b978145e 100644 --- a/apps/dav/lib/Files/LazySearchBackend.php +++ b/apps/dav/lib/Files/LazySearchBackend.php @@ -24,7 +24,7 @@ namespace OCA\DAV\Files; use SearchDAV\Backend\ISearchBackend; -use SearchDAV\Query\Query; +use SearchDAV\XML\BasicSearch; class LazySearchBackend implements ISearchBackend { /** @@ -60,7 +60,7 @@ public function getPropertyDefinitionsForScope($href, $path) { } } - public function search(Query $query) { + public function search(BasicSearch $query) { if ($this->backend) { return $this->backend->search($query); } else {