From b42b6502660e305144f549540c963ea1893d52d8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 22 Feb 2017 16:43:46 +0100 Subject: [PATCH 01/47] more tests --- src/DAV/SearchPlugin.php | 25 ++-- src/XML/BasicSearch.php | 12 +- src/XML/QueryDiscoverResponse.php | 2 +- src/XML/Scope.php | 4 +- tests/QueryParserTest.php | 48 +++++++ tests/SearchPluginTest.php | 199 ++++++++++++++++++++++++++++++ tests/discover.xml | 11 ++ tests/discoverresponse.xml | 41 ++++++ tests/nofrom.xml | 26 ++++ tests/noorder.xml | 23 ++++ tests/noselect.xml | 27 ++++ tests/nowhere.xml | 24 ++++ tests/searchresult.xml | 12 ++ 13 files changed, 442 insertions(+), 12 deletions(-) create mode 100644 tests/SearchPluginTest.php create mode 100644 tests/discover.xml create mode 100644 tests/discoverresponse.xml create mode 100644 tests/nofrom.xml create mode 100644 tests/noorder.xml create mode 100644 tests/noselect.xml create mode 100644 tests/nowhere.xml create mode 100644 tests/searchresult.xml diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 5695f27..55cc6c7 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -32,6 +32,7 @@ use Sabre\DAV\Xml\Element\Response; use Sabre\DAV\Xml\Response\MultiStatus; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; +use Sabre\Xml\ParseException; use Sabre\Xml\Writer; use SearchDAV\Backend\ISearchBackend; use SearchDAV\Backend\SearchPropertyDefinition; @@ -55,11 +56,11 @@ class SearchPlugin extends ServerPlugin { public function __construct(ISearchBackend $searchBackend) { $this->searchBackend = $searchBackend; + $this->queryParser = new QueryParser(); } public function initialize(Server $server) { $this->server = $server; - $this->queryParser = new QueryParser($this->server->xml); $server->on('method:SEARCH', [$this, 'searchHandler']); $server->on('afterMethod:OPTIONS', [$this, 'optionHandler']); $server->on('propFind', [$this, 'propFindHandler']); @@ -98,7 +99,7 @@ class SearchPlugin extends ServerPlugin { } public function optionHandler(RequestInterface $request, ResponseInterface $response) { - if ($request->getPath() === '') { + if ($request->getPath() === $this->searchBackend->getArbiterPath()) { $response->addHeader('DASL', ''); } } @@ -111,11 +112,21 @@ class SearchPlugin extends ServerPlugin { return; } - $xml = $this->queryParser->parse( - $request->getBody(), - $request->getUrl(), - $documentType - ); + if ($request->getPath() !== $this->searchBackend->getArbiterPath()) { + return; + } + + try { + $xml = $this->queryParser->parse( + $request->getBody(), + $request->getUrl(), + $documentType + ); + } catch (ParseException $e) { + $response->setStatus(400); + $response->setBody('Parse error: ' . $e->getMessage()); + return false; + } switch ($documentType) { case '{DAV:}searchrequest': diff --git a/src/XML/BasicSearch.php b/src/XML/BasicSearch.php index c4f0e1b..f3e9145 100644 --- a/src/XML/BasicSearch.php +++ b/src/XML/BasicSearch.php @@ -21,6 +21,7 @@ namespace SearchDAV\XML; +use Sabre\Xml\ParseException; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; @@ -62,10 +63,15 @@ class BasicSearch implements XmlDeserializable { $search = new self(); $elements = \Sabre\Xml\Deserializer\keyValue($reader); - $search->select = isset($elements['{DAV:}select']) ? $elements['{DAV:}select'] : null; - $search->from = isset($elements['{DAV:}from']) ? $elements['{DAV:}from'] : null; + + if (!isset($elements['{DAV:}from'])) { + throw new ParseException('Missing {DAV:}from when parsing {DAV:}basicsearch'); + } + + $search->select = isset($elements['{DAV:}select']) ? $elements['{DAV:}select'] : []; + $search->from = $elements['{DAV:}from']; $search->where = isset($elements['{DAV:}where']) ? $elements['{DAV:}where'] : null; - $search->orderBy = isset($elements['{DAV:}orderby']) ? $elements['{DAV:}orderby'] : null; + $search->orderBy = isset($elements['{DAV:}orderby']) ? $elements['{DAV:}orderby'] : []; return $search; } diff --git a/src/XML/QueryDiscoverResponse.php b/src/XML/QueryDiscoverResponse.php index 858c3da..7c5c4db 100644 --- a/src/XML/QueryDiscoverResponse.php +++ b/src/XML/QueryDiscoverResponse.php @@ -49,7 +49,7 @@ class QueryDiscoverResponse extends Response { if ($this->schema) { $writer->writeElement('{DAV:}query-schema', [ - '{DAV:basicsearchschema}' => $this->schema + '{DAV:}basicsearchschema' => $this->schema ]); } } diff --git a/src/XML/Scope.php b/src/XML/Scope.php index d4d29d0..9bc8303 100644 --- a/src/XML/Scope.php +++ b/src/XML/Scope.php @@ -53,10 +53,12 @@ class Scope implements XmlDeserializable { /** * @param string $href * @param int|string $depth + * @param string|null $path */ - public function __construct($href = '', $depth = 1) { + public function __construct($href = '', $depth = 1, $path = null) { $this->href = $href; $this->depth = $depth; + $this->path = $path; } static function xmlDeserialize(Reader $reader) { diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index 40acee7..376e267 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -55,4 +55,52 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { new Order('{DAV:}getcontentlength', Order::ASC) ], $search->orderBy); } + + public function testParseNoOrder() { + $query = file_get_contents(__DIR__ . '/noorder.xml'); + $parser = new QueryParser(); + $xml = $parser->parse($query, null, $rootElementName); + + $this->assertEquals('{DAV:}searchrequest', $rootElementName); + $this->assertArrayHasKey('{DAV:}basicsearch', $xml); + + /** @var BasicSearch $search */ + $search = $xml['{DAV:}basicsearch']; + $this->assertInstanceOf(BasicSearch::class, $search); + + $this->assertEquals(['{DAV:}getcontentlength'], $search->select); + $this->assertEquals([ + new Scope('/container1/', 'infinity'), + new Scope('/container2/', 1), + ], $search->from); + $this->assertEquals(new Operator(Operator::OPERATION_IS_COLLECTION, []), $search->where); + $this->assertEquals([], $search->orderBy); + } + + /** + * @expectedException \Sabre\XML\ParseException + */ + public function testParseNoWhere() { + $query = file_get_contents(__DIR__ . '/nowhere.xml'); + $parser = new QueryParser(); + $parser->parse($query, null, $rootElementName); + } + + /** + * @expectedException \Sabre\XML\ParseException + */ + public function testParseNoFrom() { + $query = file_get_contents(__DIR__ . '/nofrom.xml'); + $parser = new QueryParser(); + $parser->parse($query, null, $rootElementName); + } + + /** + * @expectedException \Sabre\XML\ParseException + */ + public function testParseNoSelect() { + $query = file_get_contents(__DIR__ . '/noselect.xml'); + $parser = new QueryParser(); + $parser->parse($query, null, $rootElementName); + } } diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php new file mode 100644 index 0000000..d61433a --- /dev/null +++ b/tests/SearchPluginTest.php @@ -0,0 +1,199 @@ + + * + * @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 SearchDAV\Test; + + +use Sabre\DAV\FS\Directory; +use Sabre\DAV\Server; +use Sabre\DAV\Xml\Service; +use Sabre\HTTP\Request; +use Sabre\HTTP\Response; +use Sabre\VObject\Parser\XML; +use SearchDAV\Backend\ISearchBackend; +use SearchDAV\Backend\SearchPropertyDefinition; +use SearchDAV\Backend\SearchResult; +use SearchDAV\DAV\SearchPlugin; +use SearchDAV\XML\BasicSearch; +use SearchDAV\XML\Literal; +use SearchDAV\XML\Operator; +use SearchDAV\XML\Order; +use SearchDAV\XML\Scope; + +class SearchPluginTest extends \PHPUnit_Framework_TestCase { + /** @var ISearchBackend|\PHPUnit_Framework_MockObject_MockObject */ + private $searchBackend; + + protected function setUp() { + parent::setUp(); + + $this->searchBackend = $this->getMockBuilder(ISearchBackend::class) + ->getMock(); + } + + public function testHandleParseException() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $request = new Request('SEARCH', 'foo', [ + 'Content-Type' => 'text/xml' + ], fopen(__DIR__ . '/nofrom.xml', 'r')); + $response = new Response(); + + $plugin = new SearchPlugin($this->searchBackend); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + + public function testHTTPMethods() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $server->setBaseUri('/index.php'); + $plugin->initialize($server); + + $this->assertEquals([], $plugin->getHTTPMethods('bar')); + + $this->assertEquals(['SEARCH'], $plugin->getHTTPMethods('foo')); + + $this->assertEquals([], $plugin->getHTTPMethods('http://example.com/index.php/bar')); + + $this->assertEquals(['SEARCH'], $plugin->getHTTPMethods('http://example.com/index.php/foo')); + } + + public function testOptionHandler() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + + $request = new Request('OPTIONS', '/index.php/bar'); + $request->setBaseUrl('/index.php'); + $response = new Response(); + + $plugin->optionHandler($request, $response); + + $this->assertEquals(false, $response->hasHeader('DASL')); + + $request = new Request('OPTIONS', '/index.php/foo'); + $request->setBaseUrl('/index.php'); + $response = new Response(); + + $plugin->optionHandler($request, $response); + + $this->assertEquals(true, $response->hasHeader('DASL')); + } + + public function testSchemaDiscovery() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/discover.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->once()) + ->method('isValidScope') + ->willReturn(true); + + $this->searchBackend->expects($this->once()) + ->method('getPropertyDefinitionsForScope') + ->willReturn([ + new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), + new SearchPropertyDefinition('{DAV:}displayname', true, true, true), + new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + ]); + + $plugin->searchHandler($request, $response); + + $parser = new Service(); + $parsedResponse = $parser->parse($response->getBody()); + $expected = $parser->parse(fopen(__DIR__ . '/discoverresponse.xml', 'r')); + $this->assertEquals($expected, $parsedResponse); + } + + public function testSearchQuery() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/basicquery.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); + + $query = new BasicSearch(); + $query->orderBy = [ + new Order('{DAV:}getcontentlength', Order::ASC) + ]; + $query->select = ['{DAV:}getcontentlength']; + $query->from = [ + new Scope('/container1/', 'infinity', '/container1/') + ]; + $query->where = new Operator(Operator::OPERATION_GREATER_THAN, [ + '{DAV:}getcontentlength', + new Literal(10000) + ]); + + $this->searchBackend->expects($this->once()) + ->method('search') + ->with($query) + ->willReturn([ + new SearchResult( + new Directory('/foo'), + '/foo' + ) + ]); + + $plugin->searchHandler($request, $response); + + $parser = new Service(); + $parsedResponse = $parser->parse($response->getBody()); + $expected = $parser->parse(fopen(__DIR__ . '/searchresult.xml', 'r')); + $this->assertEquals($expected, $parsedResponse); + } +} diff --git a/tests/discover.xml b/tests/discover.xml new file mode 100644 index 0000000..53c27c1 --- /dev/null +++ b/tests/discover.xml @@ -0,0 +1,11 @@ + + + + + + /test + infinity + + + + diff --git a/tests/discoverresponse.xml b/tests/discoverresponse.xml new file mode 100644 index 0000000..bb65cb0 --- /dev/null +++ b/tests/discoverresponse.xml @@ -0,0 +1,41 @@ + + + + HTTP/1.1 200 OK + /test + + + + + {DAV:}getcontentlength + + + + + + + + + {DAV:}getcontenttype + {DAV:}displayname + + + + + + + + + {http://ns.nextcloud.com:}fileid + + + + + + + + + + + diff --git a/tests/nofrom.xml b/tests/nofrom.xml new file mode 100644 index 0000000..d4866af --- /dev/null +++ b/tests/nofrom.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + 10000 + + + + + + + + + + + + diff --git a/tests/noorder.xml b/tests/noorder.xml new file mode 100644 index 0000000..bea72d3 --- /dev/null +++ b/tests/noorder.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + /container1/ + infinity + + + /container2/ + 1 + + + + + + + diff --git a/tests/noselect.xml b/tests/noselect.xml new file mode 100644 index 0000000..b8f913f --- /dev/null +++ b/tests/noselect.xml @@ -0,0 +1,27 @@ + + + + + + /container1/ + infinity + + + + + + + + 10000 + + + + + + + + + + + + diff --git a/tests/nowhere.xml b/tests/nowhere.xml new file mode 100644 index 0000000..4ec36c6 --- /dev/null +++ b/tests/nowhere.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + /container1/ + infinity + + + + + + + + + + + + diff --git a/tests/searchresult.xml b/tests/searchresult.xml new file mode 100644 index 0000000..0563d8b --- /dev/null +++ b/tests/searchresult.xml @@ -0,0 +1,12 @@ + + + + foo/ + + + + + HTTP/1.1 404 Not Found + + + From 695bb7c694b32c89e321c58c0b772b3adf572136 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 22 Feb 2017 17:05:38 +0100 Subject: [PATCH 02/47] test search with invalid queries --- .travis.yml | 15 ++++++++++ src/DAV/SearchPlugin.php | 10 +++++++ tests/SearchPluginTest.php | 56 ++++++++++++++++++++++++++++++++++++++ tests/phpunit.xml | 11 ++++++++ 4 files changed, 92 insertions(+) create mode 100644 .travis.yml create mode 100644 tests/phpunit.xml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..0f892f0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +language: php +php: + - '5.6' + - '7.0' + - '7.1' + +install: + - composer install --dev --no-interaction + +script: + - cd tests + - phpunit --coverage-clover coverage.xml --configuration phpunit.xml + +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 55cc6c7..a8027fb 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -135,6 +135,16 @@ class SearchPlugin extends ServerPlugin { } /** @var BasicSearch $query */ $query = $xml['{DAV:}basicsearch']; + if (!$query->where) { + $response->setStatus(400); + $response->setBody('Parse error: Missing {DAV:}where from {DAV:}basicsearch'); + return false; + } + if (!$query->select) { + $response->setStatus(400); + $response->setBody('Parse error: Missing {DAV:}select from {DAV:}basicsearch'); + return false; + } $response->setStatus(207); $response->setHeader('Content-Type', 'application/xml; charset="utf-8"'); foreach ($query->from as $scope) { diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index d61433a..bccb460 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -196,4 +196,60 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $expected = $parser->parse(fopen(__DIR__ . '/searchresult.xml', 'r')); $this->assertEquals($expected, $parsedResponse); } + + public function testSearchQueryNoFrom() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/nofrom.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); + + $this->searchBackend->expects($this->never()) + ->method('search'); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + + public function testSearchQueryNoWhere() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/nowhere.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); + + $this->searchBackend->expects($this->never()) + ->method('search'); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } } diff --git a/tests/phpunit.xml b/tests/phpunit.xml new file mode 100644 index 0000000..cabfbf4 --- /dev/null +++ b/tests/phpunit.xml @@ -0,0 +1,11 @@ + + + + ./ + + + + ../src + + + From d609774b97e6e412ff6376dbf428dc578e0c789c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 22 Feb 2017 17:07:51 +0100 Subject: [PATCH 03/47] fix travis --- .travis.yml | 6 +++++- tests/DummyBackend.php | 6 +++--- tests/QueryParserTest.php | 18 ------------------ tests/bootstrap.php | 3 +++ tests/test.php | 9 --------- tests/testserver.php | 8 -------- 6 files changed, 11 insertions(+), 39 deletions(-) create mode 100644 tests/bootstrap.php delete mode 100644 tests/test.php delete mode 100644 tests/testserver.php diff --git a/.travis.yml b/.travis.yml index 0f892f0..b26f688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,12 @@ php: - '7.0' - '7.1' +cache: + directories: + - $HOME/.composer/cache/files + install: - - composer install --dev --no-interaction + - composer install --no-interaction script: - cd tests diff --git a/tests/DummyBackend.php b/tests/DummyBackend.php index 623dd87..c9e7bfc 100644 --- a/tests/DummyBackend.php +++ b/tests/DummyBackend.php @@ -34,11 +34,11 @@ class DummyBackend implements ISearchBackend { return ''; } - public function isValidScope($href, $depth) { + public function isValidScope($href, $depth, $path) { return true; } - public function getPropertyDefinitionsForScope($href) { + public function getPropertyDefinitionsForScope($href, $path) { return [ new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), @@ -47,7 +47,7 @@ class DummyBackend implements ISearchBackend { ]; } - public function search(INode $searchNode, BasicSearch $query) { + public function search(BasicSearch $query) { return [ new SearchResult(new SimpleFile('foo.txt', 'foobar', 'text/plain'), '/bar/foo.txt') ]; diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index 376e267..c3ce81e 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -77,15 +77,6 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { $this->assertEquals([], $search->orderBy); } - /** - * @expectedException \Sabre\XML\ParseException - */ - public function testParseNoWhere() { - $query = file_get_contents(__DIR__ . '/nowhere.xml'); - $parser = new QueryParser(); - $parser->parse($query, null, $rootElementName); - } - /** * @expectedException \Sabre\XML\ParseException */ @@ -94,13 +85,4 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { $parser = new QueryParser(); $parser->parse($query, null, $rootElementName); } - - /** - * @expectedException \Sabre\XML\ParseException - */ - public function testParseNoSelect() { - $query = file_get_contents(__DIR__ . '/noselect.xml'); - $parser = new QueryParser(); - $parser->parse($query, null, $rootElementName); - } } diff --git a/tests/bootstrap.php b/tests/bootstrap.php new file mode 100644 index 0000000..52135e2 --- /dev/null +++ b/tests/bootstrap.php @@ -0,0 +1,3 @@ +parse($body)['{DAV:}basicsearch']); diff --git a/tests/testserver.php b/tests/testserver.php deleted file mode 100644 index ec4bb9e..0000000 --- a/tests/testserver.php +++ /dev/null @@ -1,8 +0,0 @@ -addPlugin(new \SearchDAV\DAV\SearchPlugin(new \SearchDAV\Test\DummyBackend())); - -$server->exec(); From 6f0b945196f47be26659e8591ddea97b3b9c26b6 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 22 Feb 2017 17:28:58 +0100 Subject: [PATCH 04/47] badges --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 4f5c6d4..2ec480e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # SearchDAV +[![Build Status](https://travis-ci.org/icewind1991/SearchDAV.svg?branch=master)](https://travis-ci.org/icewind1991/SearchDAV) +[![codecov](https://codecov.io/gh/icewind1991/SearchDAV/branch/master/graph/badge.svg)](https://codecov.io/gh/icewind1991/SearchDAV) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/icewind1991/SearchDAV/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/icewind1991/SearchDAV/?branch=master) + A sabre/dav plugin to implement rfc5323 SEARCH ## Usage From 1e7efdd48b181fed168eb4b88daa57690f071ce8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 22 Feb 2017 17:42:04 +0100 Subject: [PATCH 05/47] code splitting --- src/DAV/DiscoverHandler.php | 110 +++++++++++++++++++++++++++ src/DAV/PathHelper.php | 50 +++++++++++++ src/DAV/SearchHandler.php | 117 +++++++++++++++++++++++++++++ src/DAV/SearchPlugin.php | 144 +++++------------------------------- 4 files changed, 294 insertions(+), 127 deletions(-) create mode 100644 src/DAV/DiscoverHandler.php create mode 100644 src/DAV/PathHelper.php create mode 100644 src/DAV/SearchHandler.php diff --git a/src/DAV/DiscoverHandler.php b/src/DAV/DiscoverHandler.php new file mode 100644 index 0000000..947febf --- /dev/null +++ b/src/DAV/DiscoverHandler.php @@ -0,0 +1,110 @@ + + * + * @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 SearchDAV\DAV; + +use Sabre\DAV\Exception\BadRequest; +use Sabre\DAV\Xml\Response\MultiStatus; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; +use SearchDAV\Backend\ISearchBackend; +use SearchDAV\Backend\SearchPropertyDefinition; +use SearchDAV\XML\BasicSearch; +use SearchDAV\XML\BasicSearchSchema; +use SearchDAV\XML\PropDesc; +use SearchDAV\XML\QueryDiscoverResponse; +use SearchDAV\XML\Scope; + +class DiscoverHandler { + /** @var ISearchBackend */ + private $searchBackend; + + /** @var PathHelper */ + private $pathHelper; + + /** @var QueryParser */ + private $queryParser; + + /** + * @param ISearchBackend $searchBackend + * @param PathHelper $pathHelper + * @param QueryParser $queryParser + */ + public function __construct(ISearchBackend $searchBackend, PathHelper $pathHelper, QueryParser $queryParser) { + $this->searchBackend = $searchBackend; + $this->pathHelper = $pathHelper; + $this->queryParser = $queryParser; + } + + public function handelDiscoverRequest($xml, RequestInterface $request, ResponseInterface $response) { + if (!$xml['{DAV:}basicsearch']) { + throw new BadRequest('Unexpected xml content for query-schema-discovery, expected basicsearch'); + } + /** @var BasicSearch $query */ + $query = $xml['{DAV:}basicsearch']; + $scopes = $query->from; + $results = array_map(function (Scope $scope) { + $scope->path = $this->pathHelper->getPathFromUri($scope->href); + if ($this->searchBackend->isValidScope($scope->href, $scope->depth, $scope->path)) { + $searchProperties = $this->searchBackend->getPropertyDefinitionsForScope($scope->href, $scope->path); + $searchSchema = $this->getBasicSearchForProperties($searchProperties); + return new QueryDiscoverResponse($scope->href, $searchSchema, 200); + } else { + return new QueryDiscoverResponse($scope->href, null, 404); // TODO something other than 404? 403 maybe + } + }, $scopes); + $multiStatus = new MultiStatus($results); + $response->setStatus(207); + $response->setHeader('Content-Type', 'application/xml; charset="utf-8"'); + $response->setBody($this->queryParser->write('{DAV:}multistatus', $multiStatus, $request->getUrl())); + return false; + } + + private function hashDefinition(SearchPropertyDefinition $definition) { + return $definition->dataType + . (($definition->searchable) ? '1' : '0') + . (($definition->sortable) ? '1' : '0') + . (($definition->selectable) ? '1' : '0'); + } + + /** + * @param SearchPropertyDefinition[] $propertyDefinitions + * @return BasicSearchSchema + */ + private function getBasicSearchForProperties(array $propertyDefinitions) { + /** @var PropDesc[] $groups */ + $groups = []; + foreach ($propertyDefinitions as $propertyDefinition) { + $key = $this->hashDefinition($propertyDefinition); + if (!isset($groups[$key])) { + $desc = new PropDesc(); + $desc->dataType = $propertyDefinition->dataType; + $desc->sortable = $propertyDefinition->sortable; + $desc->selectable = $propertyDefinition->selectable; + $desc->searchable = $propertyDefinition->searchable; + $groups[$key] = $desc; + } + $groups[$key]->properties[] = $propertyDefinition->name; + } + + return new BasicSearchSchema(array_values($groups)); + } +} diff --git a/src/DAV/PathHelper.php b/src/DAV/PathHelper.php new file mode 100644 index 0000000..de7ea6a --- /dev/null +++ b/src/DAV/PathHelper.php @@ -0,0 +1,50 @@ + + * + * @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 SearchDAV\DAV; + +use Sabre\DAV\Exception\Forbidden; +use Sabre\DAV\Server; + +class PathHelper { + /** @var Server */ + private $server; + + /** + * PathHelper constructor. + * + * @param Server $server + */ + public function __construct(Server $server) { + $this->server = $server; + } + + public function getPathFromUri($uri) { + if (strpos($uri, '://') === false) { + return $uri; + } + try { + return ($uri === '' && $this->server->getBaseUri() === '/') ? '' : $this->server->calculateUri($uri); + } catch (Forbidden $e) { + return null; + } + } +} diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php new file mode 100644 index 0000000..64a5727 --- /dev/null +++ b/src/DAV/SearchHandler.php @@ -0,0 +1,117 @@ + + * + * @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 SearchDAV\DAV; + +use Sabre\DAV\Exception\BadRequest; +use Sabre\DAV\PropFind; +use Sabre\DAV\Server; +use Sabre\HTTP\ResponseInterface; +use SearchDAV\Backend\ISearchBackend; +use SearchDAV\Backend\SearchResult; +use SearchDAV\XML\BasicSearch; + +class SearchHandler { + /** @var ISearchBackend */ + private $searchBackend; + + /** @var PathHelper */ + private $pathHelper; + + /** @var Server */ + private $server; + + /** + * @param ISearchBackend $searchBackend + * @param PathHelper $pathHelper + * @param Server $server + */ + public function __construct(ISearchBackend $searchBackend, PathHelper $pathHelper, Server $server) { + $this->searchBackend = $searchBackend; + $this->pathHelper = $pathHelper; + $this->server = $server; + } + + public function handleSearchRequest($xml, ResponseInterface $response) { + if (!$xml['{DAV:}basicsearch']) { + throw new BadRequest('Unexpected xml content for searchrequest, expected basicsearch'); + } + /** @var BasicSearch $query */ + $query = $xml['{DAV:}basicsearch']; + if (!$query->where) { + $response->setStatus(400); + $response->setBody('Parse error: Missing {DAV:}where from {DAV:}basicsearch'); + return false; + } + if (!$query->select) { + $response->setStatus(400); + $response->setBody('Parse error: Missing {DAV:}select from {DAV:}basicsearch'); + return false; + } + $response->setStatus(207); + $response->setHeader('Content-Type', 'application/xml; charset="utf-8"'); + foreach ($query->from as $scope) { + $scope->path = $this->pathHelper->getPathFromUri($scope->href); + } + $results = $this->searchBackend->search($query); + $data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults($results, $query->select)), false); + $response->setBody($data); + return false; + } + + /** + * Returns a list of properties for a given path + * + * The path that should be supplied should have the baseUrl stripped out + * The list of properties should be supplied in Clark notation. If the list is empty + * 'allprops' is assumed. + * + * If a depth of 1 is requested child elements will also be returned. + * + * @param SearchResult[] $results + * @param array $propertyNames + * @param int $depth + * @return \Iterator + */ + private function getPropertiesIteratorResults($results, $propertyNames = [], $depth = 0) { + $propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS; + + foreach ($results as $result) { + $node = $result->node; + $propFind = new PropFind($result->href, (array)$propertyNames, $depth, $propFindType); + $r = $this->server->getPropertiesByNode($propFind, $node); + if ($r) { + $result = $propFind->getResultForMultiStatus(); + $result['href'] = $propFind->getPath(); + + // WebDAV recommends adding a slash to the path, if the path is + // a collection. + // Furthermore, iCal also demands this to be the case for + // principals. This is non-standard, but we support it. + $resourceType = $this->server->getResourceTypeForNode($node); + if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) { + $result['href'] .= '/'; + } + yield $result; + } + } + } +} diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index a8027fb..2b43e49 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -54,6 +54,15 @@ class SearchPlugin extends ServerPlugin { /** @var QueryParser */ private $queryParser; + /** @var PathHelper */ + private $pathHelper; + + /** @var SearchHandler */ + private $search; + + /** @var DiscoverHandler */ + private $discover; + public function __construct(ISearchBackend $searchBackend) { $this->searchBackend = $searchBackend; $this->queryParser = new QueryParser(); @@ -61,6 +70,9 @@ class SearchPlugin extends ServerPlugin { public function initialize(Server $server) { $this->server = $server; + $this->pathHelper = new PathHelper($server); + $this->search = new SearchHandler($this->searchBackend, $this->pathHelper, $server); + $this->discover = new DiscoverHandler($this->searchBackend, $this->pathHelper, $this->queryParser); $server->on('method:SEARCH', [$this, 'searchHandler']); $server->on('afterMethod:OPTIONS', [$this, 'optionHandler']); $server->on('propFind', [$this, 'propFindHandler']); @@ -72,17 +84,6 @@ class SearchPlugin extends ServerPlugin { } } - private function getPathFromUri($uri) { - if (strpos($uri, '://') === false) { - return $uri; - } - try { - return ($uri === '' && $this->server->getBaseUri() === '/') ? '' : $this->server->calculateUri($uri); - } catch (Forbidden $e) { - return null; - } - } - /** * SEARCH is allowed for users files * @@ -90,7 +91,7 @@ class SearchPlugin extends ServerPlugin { * @return array */ public function getHTTPMethods($uri) { - $path = $this->getPathFromUri($uri); + $path = $this->pathHelper->getPathFromUri($uri); if ($this->searchBackend->getArbiterPath() === $path) { return ['SEARCH']; } else { @@ -109,11 +110,11 @@ class SearchPlugin extends ServerPlugin { // Currently we only support xml search queries if ((strpos($contentType, 'text/xml') === false) && (strpos($contentType, 'application/xml') === false)) { - return; + return true; } if ($request->getPath() !== $this->searchBackend->getArbiterPath()) { - return; + return true; } try { @@ -130,122 +131,11 @@ class SearchPlugin extends ServerPlugin { switch ($documentType) { case '{DAV:}searchrequest': - if (!$xml['{DAV:}basicsearch']) { - throw new BadRequest('Unexpected xml content for searchrequest, expected basicsearch'); - } - /** @var BasicSearch $query */ - $query = $xml['{DAV:}basicsearch']; - if (!$query->where) { - $response->setStatus(400); - $response->setBody('Parse error: Missing {DAV:}where from {DAV:}basicsearch'); - return false; - } - if (!$query->select) { - $response->setStatus(400); - $response->setBody('Parse error: Missing {DAV:}select from {DAV:}basicsearch'); - return false; - } - $response->setStatus(207); - $response->setHeader('Content-Type', 'application/xml; charset="utf-8"'); - foreach ($query->from as $scope) { - $scope->path = $this->getPathFromUri($scope->href); - } - $results = $this->searchBackend->search($query); - $data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults($results, $query->select)), false); - $response->setBody($data); - return false; + return $this->search->handleSearchRequest($xml, $response); case '{DAV:}query-schema-discovery': - if (!$xml['{DAV:}basicsearch']) { - throw new BadRequest('Unexpected xml content for query-schema-discovery, expected basicsearch'); - } - /** @var BasicSearch $query */ - $query = $xml['{DAV:}basicsearch']; - $scopes = $query->from; - $results = array_map(function (Scope $scope) { - $scope->path = $this->getPathFromUri($scope->href); - if ($this->searchBackend->isValidScope($scope->href, $scope->depth, $scope->path)) { - $searchProperties = $this->searchBackend->getPropertyDefinitionsForScope($scope->href, $scope->path); - $searchSchema = $this->getBasicSearchForProperties($searchProperties); - return new QueryDiscoverResponse($scope->href, $searchSchema, 200); - } else { - return new QueryDiscoverResponse($scope->href, null, 404); // TODO something other than 404? 403 maybe - } - }, $scopes); - $multiStatus = new MultiStatus($results); - $response->setStatus(207); - $response->setHeader('Content-Type', 'application/xml; charset="utf-8"'); - $response->setBody($this->queryParser->write('{DAV:}multistatus', $multiStatus, $request->getUrl())); - return false; + return $this->discover->handelDiscoverRequest($xml, $request, $response); default: throw new BadRequest('Unexpected document type: ' . $documentType . ' for this Content-Type'); } } - - /** - * Returns a list of properties for a given path - * - * The path that should be supplied should have the baseUrl stripped out - * The list of properties should be supplied in Clark notation. If the list is empty - * 'allprops' is assumed. - * - * If a depth of 1 is requested child elements will also be returned. - * - * @param SearchResult[] $results - * @param array $propertyNames - * @param int $depth - * @return \Iterator - */ - function getPropertiesIteratorResults($results, $propertyNames = [], $depth = 0) { - $propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS; - - foreach ($results as $result) { - $node = $result->node; - $propFind = new PropFind($result->href, (array)$propertyNames, $depth, $propFindType); - $r = $this->server->getPropertiesByNode($propFind, $node); - if ($r) { - $result = $propFind->getResultForMultiStatus(); - $result['href'] = $propFind->getPath(); - - // WebDAV recommends adding a slash to the path, if the path is - // a collection. - // Furthermore, iCal also demands this to be the case for - // principals. This is non-standard, but we support it. - $resourceType = $this->server->getResourceTypeForNode($node); - if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) { - $result['href'] .= '/'; - } - yield $result; - } - } - } - - private function hashDefinition(SearchPropertyDefinition $definition) { - return $definition->dataType - . (($definition->searchable) ? '1' : '0') - . (($definition->sortable) ? '1' : '0') - . (($definition->selectable) ? '1' : '0'); - } - - /** - * @param SearchPropertyDefinition[] $propertyDefinitions - * @return BasicSearchSchema - */ - private function getBasicSearchForProperties(array $propertyDefinitions) { - /** @var PropDesc[] $groups */ - $groups = []; - foreach ($propertyDefinitions as $propertyDefinition) { - $key = $this->hashDefinition($propertyDefinition); - if (!isset($groups[$key])) { - $desc = new PropDesc(); - $desc->dataType = $propertyDefinition->dataType; - $desc->sortable = $propertyDefinition->sortable; - $desc->selectable = $propertyDefinition->selectable; - $desc->searchable = $propertyDefinition->searchable; - $groups[$key] = $desc; - } - $groups[$key]->properties[] = $propertyDefinition->name; - } - - return new BasicSearchSchema(array_values($groups)); - } } From 5c2a3f1b021ccd18a12f8aa6b196c07fefac67ee Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 22 Feb 2017 18:14:08 +0100 Subject: [PATCH 06/47] add more tests --- src/DAV/DiscoverHandler.php | 6 +- src/DAV/SearchHandler.php | 6 +- src/DAV/SearchPlugin.php | 4 +- tests/PathHelperTest.php | 51 +++++++++ tests/QueryParserTest.php | 12 +++ tests/SearchPluginTest.php | 185 +++++++++++++++++++++++++++++++++ tests/invalid.xml | 30 ++++++ tests/invaliddiscover.xml | 9 ++ tests/invalidscoperesponse.xml | 8 ++ tests/invalidtype.xml | 22 ++++ tests/supportedgrammar.xml | 9 ++ 11 files changed, 337 insertions(+), 5 deletions(-) create mode 100644 tests/PathHelperTest.php create mode 100644 tests/invalid.xml create mode 100644 tests/invaliddiscover.xml create mode 100644 tests/invalidscoperesponse.xml create mode 100644 tests/invalidtype.xml create mode 100644 tests/supportedgrammar.xml diff --git a/src/DAV/DiscoverHandler.php b/src/DAV/DiscoverHandler.php index 947febf..675fd6a 100644 --- a/src/DAV/DiscoverHandler.php +++ b/src/DAV/DiscoverHandler.php @@ -55,8 +55,10 @@ class DiscoverHandler { } public function handelDiscoverRequest($xml, RequestInterface $request, ResponseInterface $response) { - if (!$xml['{DAV:}basicsearch']) { - throw new BadRequest('Unexpected xml content for query-schema-discovery, expected basicsearch'); + if (!isset($xml['{DAV:}basicsearch'])) { + $response->setStatus(400); + $response->setBody('Unexpected xml content for query-schema-discovery, expected basicsearch'); + return false; } /** @var BasicSearch $query */ $query = $xml['{DAV:}basicsearch']; diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index 64a5727..b71778f 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -51,8 +51,10 @@ class SearchHandler { } public function handleSearchRequest($xml, ResponseInterface $response) { - if (!$xml['{DAV:}basicsearch']) { - throw new BadRequest('Unexpected xml content for searchrequest, expected basicsearch'); + if (!isset($xml['{DAV:}basicsearch'])) { + $response->setStatus(400); + $response->setBody('Unexpected xml content for searchrequest, expected basicsearch'); + return false; } /** @var BasicSearch $query */ $query = $xml['{DAV:}basicsearch']; diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 2b43e49..6e2f0e7 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -135,7 +135,9 @@ class SearchPlugin extends ServerPlugin { case '{DAV:}query-schema-discovery': return $this->discover->handelDiscoverRequest($xml, $request, $response); default: - throw new BadRequest('Unexpected document type: ' . $documentType . ' for this Content-Type'); + $response->setStatus(400); + $response->setBody('Unexpected document type: ' . $documentType . ' for this Content-Type, expected {DAV:}searchrequest or {DAV:}query-schema-discovery'); + return false; } } } diff --git a/tests/PathHelperTest.php b/tests/PathHelperTest.php new file mode 100644 index 0000000..259ab2f --- /dev/null +++ b/tests/PathHelperTest.php @@ -0,0 +1,51 @@ + + * + * @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 SearchDAV\Test; + +use Sabre\DAV\Server; +use SearchDAV\DAV\PathHelper; + +class PathHelperTest extends \PHPUnit_Framework_TestCase { + public function uriProvider(){ + return [ + ['/', '', ''], + ['/index.php/', 'foo', 'foo'], + ['/index.php/', 'http://example.com/index.php/foo', 'foo'], + ['/index.php/', 'http://example.com/foo', null] + ]; + } + + /** + * @dataProvider uriProvider + * + * @param $baseUri + * @param $uri + * @param $expected + */ + public function testGetPathFromUri($baseUri, $uri, $expected) { + $server = new Server(); + $server->setBaseUri($baseUri); + $pathHelper = new PathHelper($server); + + $this->assertEquals($expected, $pathHelper->getPathFromUri($uri)); + } +} diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index c3ce81e..b717125 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -22,12 +22,14 @@ namespace SearchDAV\Test; +use Sabre\Xml\Service; use SearchDAV\DAV\QueryParser; use SearchDAV\XML\BasicSearch; use SearchDAV\XML\Literal; use SearchDAV\XML\Operator; use SearchDAV\XML\Order; use SearchDAV\XML\Scope; +use SearchDAV\XML\SupportedQueryGrammar; class QueryParserTest extends \PHPUnit_Framework_TestCase { @@ -85,4 +87,14 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { $parser = new QueryParser(); $parser->parse($query, null, $rootElementName); } + + public function testSerializeSupportedGrammar() { + $supportedGrammar = new SupportedQueryGrammar(); + + $parser = new QueryParser(); + $serialized = $parser->write('{DAV:}supported-query-grammar-set', $supportedGrammar); + + $xml = new Service(); + $this->assertEquals($xml->parse(fopen(__DIR__ . '/supportedgrammar.xml', 'r')), $xml->parse($serialized)); + } } diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index bccb460..bdaec56 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -23,6 +23,8 @@ namespace SearchDAV\Test; use Sabre\DAV\FS\Directory; +use Sabre\DAV\INode; +use Sabre\DAV\PropFind; use Sabre\DAV\Server; use Sabre\DAV\Xml\Service; use Sabre\HTTP\Request; @@ -37,6 +39,7 @@ use SearchDAV\XML\Literal; use SearchDAV\XML\Operator; use SearchDAV\XML\Order; use SearchDAV\XML\Scope; +use SearchDAV\XML\SupportedQueryGrammar; class SearchPluginTest extends \PHPUnit_Framework_TestCase { /** @var ISearchBackend|\PHPUnit_Framework_MockObject_MockObject */ @@ -49,6 +52,53 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->getMock(); } + public function testNoXmlBody() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $request = new Request('SEARCH', 'foo', [ + 'Content-Type' => 'text/plain' + ], fopen(__DIR__ . '/nofrom.xml', 'r')); + $response = new Response(); + + $plugin = new SearchPlugin($this->searchBackend); + + $this->assertNotEquals(false, $plugin->searchHandler($request, $response)); + } + + public function testNotArbiterPath() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $request = new Request('SEARCH', 'bar', [ + 'Content-Type' => 'text/xml' + ], fopen(__DIR__ . '/nofrom.xml', 'r')); + $response = new Response(); + + $plugin = new SearchPlugin($this->searchBackend); + + $this->assertNotEquals(false, $plugin->searchHandler($request, $response)); + } + + public function testInvalidType() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $request = new Request('SEARCH', 'foo', [ + 'Content-Type' => 'text/xml' + ], fopen(__DIR__ . '/invalidtype.xml', 'r')); + $response = new Response(); + + $plugin = new SearchPlugin($this->searchBackend); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + public function testHandleParseException() { $this->searchBackend->expects($this->any()) ->method('getArbiterPath') @@ -146,6 +196,64 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->assertEquals($expected, $parsedResponse); } + public function testSchemaDiscoveryInvalidScope() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/discover.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->once()) + ->method('isValidScope') + ->willReturn(false); + + $this->searchBackend->expects($this->never()) + ->method('getPropertyDefinitionsForScope'); + + $plugin->searchHandler($request, $response); + + $parser = new Service(); + $parsedResponse = $parser->parse($response->getBody()); + $expected = $parser->parse(fopen(__DIR__ . '/invalidscoperesponse.xml', 'r')); + $this->assertEquals($expected, $parsedResponse); + } + + public function testSchemaDiscoveryInvalid() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/invaliddiscover.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->never()) + ->method('isValidScope'); + + $this->searchBackend->expects($this->never()) + ->method('getPropertyDefinitionsForScope'); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + public function testSearchQuery() { $this->searchBackend->expects($this->any()) ->method('getArbiterPath') @@ -252,4 +360,81 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->assertEquals(400, $response->getStatus()); } + + public function testSearchQueryNoSelect() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/noselect.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); + + $this->searchBackend->expects($this->never()) + ->method('search'); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + + public function testSearchInvalid() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/invalid.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); + + $this->searchBackend->expects($this->never()) + ->method('search'); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + + public function testPropFindHandler() { + $propFind = new PropFind('bar', ['{DAV:}supported-query-grammar-set']); + + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + + /** @var INode $node */ + $node = $this->getMockBuilder(INode::class)->getMock(); + $plugin->propFindHandler($propFind, $node); + + $this->assertEquals(null, $propFind->get('{DAV:}supported-query-grammar-set')); + + $propFind = new PropFind('foo', ['{DAV:}supported-query-grammar-set']); + $plugin->propFindHandler($propFind, $node); + + $this->assertEquals(new SupportedQueryGrammar(), $propFind->get('{DAV:}supported-query-grammar-set')); + } } diff --git a/tests/invalid.xml b/tests/invalid.xml new file mode 100644 index 0000000..5956e5d --- /dev/null +++ b/tests/invalid.xml @@ -0,0 +1,30 @@ + + + + + + + + + + /container1/ + infinity + + + + + + + + 10000 + + + + + + + + + + + diff --git a/tests/invaliddiscover.xml b/tests/invaliddiscover.xml new file mode 100644 index 0000000..be4c289 --- /dev/null +++ b/tests/invaliddiscover.xml @@ -0,0 +1,9 @@ + + + + + /test + infinity + + + diff --git a/tests/invalidscoperesponse.xml b/tests/invalidscoperesponse.xml new file mode 100644 index 0000000..e018adf --- /dev/null +++ b/tests/invalidscoperesponse.xml @@ -0,0 +1,8 @@ + + + + HTTP/1.1 404 Not Found + /test + + diff --git a/tests/invalidtype.xml b/tests/invalidtype.xml new file mode 100644 index 0000000..0d9acf0 --- /dev/null +++ b/tests/invalidtype.xml @@ -0,0 +1,22 @@ + + + + + + + + + + /container1/ + infinity + + + + + + + + + + + diff --git a/tests/supportedgrammar.xml b/tests/supportedgrammar.xml new file mode 100644 index 0000000..37c2503 --- /dev/null +++ b/tests/supportedgrammar.xml @@ -0,0 +1,9 @@ + + + + + + + + From 0924fa90e09636cf90138bbd4e504a1dd072262d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 10 Mar 2017 15:53:28 +0100 Subject: [PATCH 07/47] add limit and offset --- README.md | 2 +- src/DAV/QueryParser.php | 5 +++- src/DAV/SearchPlugin.php | 2 ++ src/XML/BasicSearch.php | 7 +++++ src/XML/Limit.php | 59 ++++++++++++++++++++++++++++++++++++++ tests/QueryParserTest.php | 20 +++++++++++++ tests/SearchPluginTest.php | 2 ++ tests/limit.xml | 37 ++++++++++++++++++++++++ 8 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 src/XML/Limit.php create mode 100644 tests/limit.xml diff --git a/README.md b/README.md index 2ec480e..ce99ec5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![codecov](https://codecov.io/gh/icewind1991/SearchDAV/branch/master/graph/badge.svg)](https://codecov.io/gh/icewind1991/SearchDAV) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/icewind1991/SearchDAV/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/icewind1991/SearchDAV/?branch=master) -A sabre/dav plugin to implement rfc5323 SEARCH +A sabre/dav plugin to implement [rfc5323](https://tools.ietf.org/search/rfc5323) SEARCH ## Usage diff --git a/src/DAV/QueryParser.php b/src/DAV/QueryParser.php index 175be07..592b620 100644 --- a/src/DAV/QueryParser.php +++ b/src/DAV/QueryParser.php @@ -25,6 +25,7 @@ use Sabre\Xml\Element; use Sabre\Xml\Reader; use Sabre\Xml\Service; use SearchDAV\XML\BasicSearch; +use SearchDAV\XML\Limit; use SearchDAV\XML\Literal; use SearchDAV\XML\Operator; use SearchDAV\XML\Order; @@ -34,7 +35,8 @@ class QueryParser extends Service { public $namespaceMap = [ 'DAV:' => 'd', 'http://sabredav.org/ns' => 's', - 'http://www.w3.org/2001/XMLSchema' => 'xs' + 'http://www.w3.org/2001/XMLSchema' => 'xs', + SearchPlugin::SEARCHDAV_NS => 'sd' ]; public function __construct() { @@ -72,6 +74,7 @@ class QueryParser extends Service { '{DAV:}contains' => Operator::class, '{DAV:}not' => Operator::class, '{DAV:}is-collection' => Operator::class, + '{DAV:}limit' => Limit::class, ]; } } diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 6e2f0e7..873d547 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -45,6 +45,8 @@ use SearchDAV\XML\Scope; use SearchDAV\XML\SupportedQueryGrammar; class SearchPlugin extends ServerPlugin { + const SEARCHDAV_NS = 'https://github.com/icewind1991/SearchDAV/ns'; + /** @var Server */ private $server; diff --git a/src/XML/BasicSearch.php b/src/XML/BasicSearch.php index f3e9145..d626e40 100644 --- a/src/XML/BasicSearch.php +++ b/src/XML/BasicSearch.php @@ -58,6 +58,12 @@ class BasicSearch implements XmlDeserializable { * more significant. */ public $orderBy; + /** + * @var Limit + * + * The limit and offset for the search query + */ + public $limit; static function xmlDeserialize(Reader $reader) { $search = new self(); @@ -72,6 +78,7 @@ class BasicSearch implements XmlDeserializable { $search->from = $elements['{DAV:}from']; $search->where = isset($elements['{DAV:}where']) ? $elements['{DAV:}where'] : null; $search->orderBy = isset($elements['{DAV:}orderby']) ? $elements['{DAV:}orderby'] : []; + $search->limit = isset($elements['{DAV:}limit']) ? $elements['{DAV:}limit'] : new Limit(); return $search; } diff --git a/src/XML/Limit.php b/src/XML/Limit.php new file mode 100644 index 0000000..6ef295b --- /dev/null +++ b/src/XML/Limit.php @@ -0,0 +1,59 @@ + + * + * @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 SearchDAV\XML; + +use Sabre\Xml\Reader; +use Sabre\Xml\XmlDeserializable; +use SearchDAV\DAV\SearchPlugin; + +/** + * The limit and offset of a search query + */ +class Limit implements XmlDeserializable { + /** + * @var integer + * + * The maximum number of results to be returned + * + * If set to 0 then no limit should be imposed + */ + public $maxResults = 0; + /** + * @var integer + * + * The index of the first result to be returned (offset) + */ + public $firstResult = 0; + + static function xmlDeserialize(Reader $reader) { + $limit = new self(); + + $elements = \Sabre\Xml\Deserializer\keyValue($reader); + $namespace = SearchPlugin::SEARCHDAV_NS; + + $limit->maxResults = isset($elements['{DAV:}nresults']) ? $elements['{DAV:}nresults'] : 0; + $firstResult = '{' . $namespace . '}firstresult'; + $limit->firstResult = isset($elements[$firstResult]) ? $elements[$firstResult] : 0; + + return $limit; + } +} diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index b717125..9ec67e6 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -25,6 +25,7 @@ namespace SearchDAV\Test; use Sabre\Xml\Service; use SearchDAV\DAV\QueryParser; use SearchDAV\XML\BasicSearch; +use SearchDAV\XML\Limit; use SearchDAV\XML\Literal; use SearchDAV\XML\Operator; use SearchDAV\XML\Order; @@ -97,4 +98,23 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { $xml = new Service(); $this->assertEquals($xml->parse(fopen(__DIR__ . '/supportedgrammar.xml', 'r')), $xml->parse($serialized)); } + + public function testParseLimit() { + $query = file_get_contents(__DIR__ . '/limit.xml'); + $parser = new QueryParser(); + $xml = $parser->parse($query, null, $rootElementName); + + $this->assertEquals('{DAV:}searchrequest', $rootElementName); + $this->assertArrayHasKey('{DAV:}basicsearch', $xml); + + /** @var BasicSearch $search */ + $search = $xml['{DAV:}basicsearch']; + $this->assertInstanceOf(BasicSearch::class, $search); + + $this->assertEquals(['{DAV:}getcontentlength'], $search->select); + $limit = new Limit(); + $limit->firstResult = 20; + $limit->maxResults = 10; + $this->assertEquals($limit, $search->limit); + } } diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index bdaec56..260a490 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -35,6 +35,7 @@ use SearchDAV\Backend\SearchPropertyDefinition; use SearchDAV\Backend\SearchResult; use SearchDAV\DAV\SearchPlugin; use SearchDAV\XML\BasicSearch; +use SearchDAV\XML\Limit; use SearchDAV\XML\Literal; use SearchDAV\XML\Operator; use SearchDAV\XML\Order; @@ -286,6 +287,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { '{DAV:}getcontentlength', new Literal(10000) ]); + $query->limit = new Limit(); $this->searchBackend->expects($this->once()) ->method('search') diff --git a/tests/limit.xml b/tests/limit.xml new file mode 100644 index 0000000..25d2852 --- /dev/null +++ b/tests/limit.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + /container1/ + infinity + + + + + + + + 10000 + + + + + + + + + + + + 10 + 20 + + + From 0c0f05416b6dc4a795a4dfccf53459bece03ecd2 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Fri, 10 Mar 2017 15:03:32 +0000 Subject: [PATCH 08/47] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- src/DAV/SearchHandler.php | 1 - src/DAV/SearchPlugin.php | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index b71778f..92d2079 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -21,7 +21,6 @@ namespace SearchDAV\DAV; -use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\PropFind; use Sabre\DAV\Server; use Sabre\HTTP\ResponseInterface; diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 873d547..98c3ae9 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -21,27 +21,14 @@ namespace SearchDAV\DAV; -use Sabre\DAV\Exception\BadRequest; -use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\INode; -use Sabre\DAV\Node; use Sabre\DAV\PropFind; use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; -use Sabre\DAV\Xml\Element\Response; -use Sabre\DAV\Xml\Response\MultiStatus; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; use Sabre\Xml\ParseException; -use Sabre\Xml\Writer; use SearchDAV\Backend\ISearchBackend; -use SearchDAV\Backend\SearchPropertyDefinition; -use SearchDAV\Backend\SearchResult; -use SearchDAV\XML\BasicSearch; -use SearchDAV\XML\BasicSearchSchema; -use SearchDAV\XML\PropDesc; -use SearchDAV\XML\QueryDiscoverResponse; -use SearchDAV\XML\Scope; use SearchDAV\XML\SupportedQueryGrammar; class SearchPlugin extends ServerPlugin { From 3071937c64a5e45d23c2600e5524538694e03042 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 15 Mar 2017 14:20:33 +0100 Subject: [PATCH 09/47] fix descending sort order --- src/XML/Order.php | 2 +- tests/QueryParserTest.php | 25 +++++++++++++++++++++++++ tests/descending.xml | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 tests/descending.xml diff --git a/src/XML/Order.php b/src/XML/Order.php index e1285d3..15c5517 100644 --- a/src/XML/Order.php +++ b/src/XML/Order.php @@ -58,7 +58,7 @@ class Order implements XmlDeserializable { $childs = \Sabre\Xml\Deserializer\keyValue($reader); - $order->order = isset($childs['{DAV:}descending']) ? self::DESC : self::ASC; + $order->order = array_key_exists('{DAV:}descending', $childs) ? self::DESC : self::ASC; $order->property = $childs['{DAV:}prop'][0]; return $order; diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index 9ec67e6..66550e9 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -59,6 +59,31 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { ], $search->orderBy); } + public function testParseDescending() { + $query = file_get_contents(__DIR__ . '/descending.xml'); + $parser = new QueryParser(); + $xml = $parser->parse($query, null, $rootElementName); + + $this->assertEquals('{DAV:}searchrequest', $rootElementName); + $this->assertArrayHasKey('{DAV:}basicsearch', $xml); + + /** @var BasicSearch $search */ + $search = $xml['{DAV:}basicsearch']; + $this->assertInstanceOf(BasicSearch::class, $search); + + $this->assertEquals(['{DAV:}getcontentlength'], $search->select); + $this->assertEquals([ + new Scope('/container1/', 'infinity') + ], $search->from); + $this->assertEquals(new Operator(Operator::OPERATION_GREATER_THAN, [ + '{DAV:}getcontentlength', + new Literal(10000) + ]), $search->where); + $this->assertEquals([ + new Order('{DAV:}getcontentlength', Order::DESC) + ], $search->orderBy); + } + public function testParseNoOrder() { $query = file_get_contents(__DIR__ . '/noorder.xml'); $parser = new QueryParser(); diff --git a/tests/descending.xml b/tests/descending.xml new file mode 100644 index 0000000..0e4e361 --- /dev/null +++ b/tests/descending.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + /container1/ + infinity + + + + + + + + 10000 + + + + + + + + + + + + From 634f9c28d384f9775eef6d725f5a3172cfa3154b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 7 Nov 2017 14:36:59 +0100 Subject: [PATCH 10/47] Create LICENSE --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..dbbe355 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From 82bcf2cebb13cb9360bf0eaaea6b1d12353eefb2 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jan 2018 12:56:14 +0100 Subject: [PATCH 11/47] Add some more phpdoc typings --- src/XML/BasicSearch.php | 5 +++++ src/XML/PropDesc.php | 12 ++++++++++++ src/XML/QueryDiscoverResponse.php | 3 +++ 3 files changed, 20 insertions(+) diff --git a/src/XML/BasicSearch.php b/src/XML/BasicSearch.php index d626e40..8af30f4 100644 --- a/src/XML/BasicSearch.php +++ b/src/XML/BasicSearch.php @@ -65,6 +65,11 @@ class BasicSearch implements XmlDeserializable { */ public $limit; + /** + * @param Reader $reader + * @return BasicSearch + * @throws ParseException + */ static function xmlDeserialize(Reader $reader) { $search = new self(); diff --git a/src/XML/PropDesc.php b/src/XML/PropDesc.php index 8d62fcf..85e0c63 100644 --- a/src/XML/PropDesc.php +++ b/src/XML/PropDesc.php @@ -30,9 +30,21 @@ class PropDesc implements XmlSerializable { * @var string[] */ public $properties = []; + /** + * @var string + */ public $dataType; + /** + * @var boolean + */ public $searchable; + /** + * @var boolean + */ public $selectable; + /** + * @var boolean + */ public $sortable; function xmlSerialize(Writer $writer) { diff --git a/src/XML/QueryDiscoverResponse.php b/src/XML/QueryDiscoverResponse.php index 7c5c4db..b564b3b 100644 --- a/src/XML/QueryDiscoverResponse.php +++ b/src/XML/QueryDiscoverResponse.php @@ -26,6 +26,9 @@ use Sabre\DAV\Xml\Element\Response; use Sabre\Xml\Writer; class QueryDiscoverResponse extends Response { + /** + * @var BasicSearchSchema|null + */ protected $schema; /** From 5ad4d24b89e951aa9531168a6b84281c570da0b6 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jan 2018 14:48:02 +0100 Subject: [PATCH 12/47] Seperate query classes from xml classes to allow specifying more information in the query --- src/Backend/ISearchBackend.php | 8 ++-- src/DAV/SearchHandler.php | 71 +++++++++++++++++++++++++++++- src/Query/Limit.php | 40 +++++++++++++++++ src/Query/Literal.php | 41 ++++++++++++++++++ src/Query/Operator.php | 67 ++++++++++++++++++++++++++++ src/Query/Order.php | 53 +++++++++++++++++++++++ src/Query/Query.php | 79 ++++++++++++++++++++++++++++++++++ src/Query/Scope.php | 60 ++++++++++++++++++++++++++ src/XML/Limit.php | 17 +------- src/XML/Literal.php | 19 +------- src/XML/Operator.php | 17 +------- src/XML/Order.php | 7 +-- src/XML/Scope.php | 38 +--------------- tests/DummyBackend.php | 3 +- tests/QueryParserTest.php | 10 ++--- tests/SearchPluginTest.php | 59 +++++++++++++++++++++---- tests/invalidwhere.xml | 32 ++++++++++++++ 17 files changed, 509 insertions(+), 112 deletions(-) create mode 100644 src/Query/Limit.php create mode 100644 src/Query/Literal.php create mode 100644 src/Query/Operator.php create mode 100644 src/Query/Order.php create mode 100644 src/Query/Query.php create mode 100644 src/Query/Scope.php create mode 100644 tests/invalidwhere.xml diff --git a/src/Backend/ISearchBackend.php b/src/Backend/ISearchBackend.php index 8db8db6..665666c 100644 --- a/src/Backend/ISearchBackend.php +++ b/src/Backend/ISearchBackend.php @@ -21,9 +21,7 @@ namespace SearchDAV\Backend; -use Sabre\DAV\INode; -use SearchDAV\XML\BasicSearch; -use SearchDAV\XML\Scope; +use SearchDAV\Query\Query; interface ISearchBackend { /** @@ -79,8 +77,8 @@ interface ISearchBackend { * To return the properties requested by the query sabre's existing PropFind method is used, thus the search implementation * is not required to collect these properties and is free to ignore the `select` part of the query * - * @param BasicSearch $query + * @param Query $query * @return SearchResult[] */ - public function search(BasicSearch $query); + public function search(Query $query); } diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index 92d2079..132e793 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -21,11 +21,16 @@ namespace SearchDAV\DAV; +use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\PropFind; use Sabre\DAV\Server; use Sabre\HTTP\ResponseInterface; use SearchDAV\Backend\ISearchBackend; +use SearchDAV\Backend\SearchPropertyDefinition; use SearchDAV\Backend\SearchResult; +use SearchDAV\Query\Operator; +use SearchDAV\Query\Order; +use SearchDAV\Query\Query; use SearchDAV\XML\BasicSearch; class SearchHandler { @@ -69,15 +74,79 @@ class SearchHandler { } $response->setStatus(207); $response->setHeader('Content-Type', 'application/xml; charset="utf-8"'); + $allProps = []; foreach ($query->from as $scope) { $scope->path = $this->pathHelper->getPathFromUri($scope->href); + $props = $this->searchBackend->getPropertyDefinitionsForScope($scope->href, $scope->path); + foreach ($props as $prop) { + $allProps[$prop->name] = $prop; + } + } + try { + $results = $this->searchBackend->search($this->getQueryForXML($query, $allProps)); + } catch (BadRequest $e) { + $response->setStatus(400); + $response->setBody($e->getMessage()); + return false; } - $results = $this->searchBackend->search($query); $data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults($results, $query->select)), false); $response->setBody($data); return false; } + /** + * @param BasicSearch $xml + * @param SearchPropertyDefinition[] $allProps + * @return Query + */ + private function getQueryForXML(BasicSearch $xml, array $allProps) { + $orderBy = array_map(function (\SearchDAV\XML\Order $order) use ($allProps) { + if (!isset($allProps[$order->property])) { + throw new BadRequest('requested order by property is not a valid property for this scope'); + } + $prop = $allProps[$order->property]; + if (!$prop->sortable) { + throw new BadRequest('requested order by property is not sortable'); + } + return new Order($prop, $order->order); + }, $xml->orderBy); + $select = array_map(function ($propName) use ($allProps) { + if (!isset($allProps[$propName])) { + throw new BadRequest('requested property is not a valid property for this scope'); + } + $prop = $allProps[$propName]; + if (!$prop->selectable) { + throw new BadRequest('requested property is not selectable'); + } + return $prop; + }, $xml->select); + + $where = $this->transformOperator($xml->where, $allProps); + + return new Query($select, $xml->from, $where, $orderBy, $xml->limit); + } + + private function transformOperator(\SearchDAV\XML\Operator $operator, array $allProps) { + $arguments = array_map(function ($argument) use ($allProps) { + if (is_string($argument)) { + if (!isset($allProps[$argument])) { + throw new BadRequest('requested search property is not a valid property for this scope'); + } + $prop = $allProps[$argument]; + if (!$prop->searchable) { + throw new BadRequest('requested search property is not searchable'); + } + return $prop; + } else if ($argument instanceof \SearchDAV\XML\Operator) { + return $this->transformOperator($argument, $allProps); + } else { + return $argument; + } + }, $operator->arguments); + + return new Operator($operator->type, $arguments); + } + /** * Returns a list of properties for a given path * diff --git a/src/Query/Limit.php b/src/Query/Limit.php new file mode 100644 index 0000000..0619e02 --- /dev/null +++ b/src/Query/Limit.php @@ -0,0 +1,40 @@ + + * + * @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 SearchDAV\Query; + + +class Limit { + /** + * @var integer + * + * The maximum number of results to be returned + * + * If set to 0 then no limit should be imposed + */ + public $maxResults = 0; + /** + * @var integer + * + * The index of the first result to be returned (offset) + */ + public $firstResult = 0; +} diff --git a/src/Query/Literal.php b/src/Query/Literal.php new file mode 100644 index 0000000..58b2fdd --- /dev/null +++ b/src/Query/Literal.php @@ -0,0 +1,41 @@ + + * + * @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 SearchDAV\Query; + + +class Literal { + /** + * @var string|boolean|\DateTime|integer + * + * The value of the literal + */ + public $value; + + /** + * Literal constructor. + * + * @param bool|\DateTime|int|string $value + */ + public function __construct($value = '') { + $this->value = $value; + } +} diff --git a/src/Query/Operator.php b/src/Query/Operator.php new file mode 100644 index 0000000..868557b --- /dev/null +++ b/src/Query/Operator.php @@ -0,0 +1,67 @@ + + * + * @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 SearchDAV\Query; + +class Operator { + const OPERATION_AND = '{DAV:}and'; + const OPERATION_OR = '{DAV:}or'; + const OPERATION_NOT = '{DAV:}not'; + const OPERATION_EQUAL = '{DAV:}eq'; + const OPERATION_LESS_THAN = '{DAV:}lt'; + const OPERATION_LESS_OR_EQUAL_THAN = '{DAV:}lte'; + const OPERATION_GREATER_THAN = '{DAV:}gt'; + const OPERATION_GREATER_OR_EQUAL_THAN = '{DAV:}gte'; + const OPERATION_IS_COLLECTION = '{DAV:}is-collection'; + const OPERATION_IS_DEFINED = '{DAV:}is-defined'; + const OPERATION_IS_LIKE = '{DAV:}like'; + const OPERATION_CONTAINS = '{DAV:}contains'; + + /** + * @var string + * + * The type of operation, one of the Operator::OPERATION_* constants + */ + public $type; + /** + * @var (Literal|SearchPropDefinition|Operation)[] + * + * The list of arguments for the operation + * + * - SearchPropDefinition: property for comparison + * - Literal: literal value for comparison + * - Operation: nested operation for and/or/not operations + * + * Which type and what number of argument an Operator takes depends on the operator type. + */ + public $arguments; + + /** + * Operator constructor. + * + * @param string $type + * @param array $arguments + */ + public function __construct($type = '', array $arguments = []) { + $this->type = $type; + $this->arguments = $arguments; + } +} diff --git a/src/Query/Order.php b/src/Query/Order.php new file mode 100644 index 0000000..5266658 --- /dev/null +++ b/src/Query/Order.php @@ -0,0 +1,53 @@ + + * + * @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 SearchDAV\Query; + + +use SearchDAV\Backend\SearchPropertyDefinition; + +class Order { + const ASC = 'ascending'; + const DESC = 'descending'; + + /** + * @var SearchPropertyDefinition + * + * The property that should be sorted on. + */ + public $property; + /** + * @var string 'ascending' or 'descending' + * + * The sort direction + */ + public $order; + + /** + * Order constructor. + * @param SearchPropertyDefinition $property + * @param string $order + */ + public function __construct(SearchPropertyDefinition $property, $order) { + $this->property = $property; + $this->order = $order; + } +} diff --git a/src/Query/Query.php b/src/Query/Query.php new file mode 100644 index 0000000..85fc1ed --- /dev/null +++ b/src/Query/Query.php @@ -0,0 +1,79 @@ + + * + * @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 SearchDAV\Query; + + +use SearchDAV\Backend\SearchPropertyDefinition; + +class Query { + /** + * @var SearchPropertyDefinition[] + * + * The list of properties to be selected + */ + public $select; + /** + * @var Scope[] + * + * The collections to perform the search in + */ + public $from; + /** + * @var Operator + * + * The search operator, either a comparison ('gt', 'eq', ...) or a boolean operator ('and', 'or', 'not') + */ + public $where; + /** + * @var Order[] + * + * The list of order operations that should be used to order the results. + * + * Each order operations consists of a property to sort on and a sort direction. + * If more then one order operations are specified, the comparisons for ordering should + * be applied in the order that the order operations are defined in with the earlier comparisons being + * more significant. + */ + public $orderBy; + /** + * @var Limit + * + * The limit and offset for the search query + */ + public $limit; + + /** + * Query constructor. + * @param SearchPropertyDefinition[] $select + * @param Scope[] $from + * @param Operator $where + * @param Order[] $orderBy + * @param Limit $limit + */ + public function __construct(array $select, array $from, Operator $where, array $orderBy, Limit $limit) { + $this->select = $select; + $this->from = $from; + $this->where = $where; + $this->orderBy = $orderBy; + $this->limit = $limit; + } +} diff --git a/src/Query/Scope.php b/src/Query/Scope.php new file mode 100644 index 0000000..ebc778d --- /dev/null +++ b/src/Query/Scope.php @@ -0,0 +1,60 @@ + + * + * @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 SearchDAV\Query; + + +class Scope { + /** + * @var string + * + * The scope of the search, either as absolute uri or as a path relative to the + * search arbiter. + */ + public $href; + + /** + * @var string|int 0, 1 or 'infinite' + * + * How deep the search query should be with 0 being only the scope itself, + * 1 being all direct child entries of the scope and infinite being all entries + * in the scope collection at any depth. + */ + public $depth; + + /** + * @var string|null + * + * the path of the search scope relative to the dav server, or null if the scope is outside the dav server + */ + public $path; + + /** + * @param string $href + * @param int|string $depth + * @param string|null $path + */ + public function __construct($href = '', $depth = 1, $path = null) { + $this->href = $href; + $this->depth = $depth; + $this->path = $path; + } +} diff --git a/src/XML/Limit.php b/src/XML/Limit.php index 6ef295b..0179d40 100644 --- a/src/XML/Limit.php +++ b/src/XML/Limit.php @@ -28,22 +28,7 @@ use SearchDAV\DAV\SearchPlugin; /** * The limit and offset of a search query */ -class Limit implements XmlDeserializable { - /** - * @var integer - * - * The maximum number of results to be returned - * - * If set to 0 then no limit should be imposed - */ - public $maxResults = 0; - /** - * @var integer - * - * The index of the first result to be returned (offset) - */ - public $firstResult = 0; - +class Limit extends \SearchDAV\Query\Limit implements XmlDeserializable { static function xmlDeserialize(Reader $reader) { $limit = new self(); diff --git a/src/XML/Literal.php b/src/XML/Literal.php index 5564c3d..03d167f 100644 --- a/src/XML/Literal.php +++ b/src/XML/Literal.php @@ -25,24 +25,7 @@ namespace SearchDAV\XML; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -class Literal implements XmlDeserializable { - /** - * @var string|boolean|\DateTime|integer - * - * The value of the literal - */ - public $value; - - /** - * Literal constructor. - * - * @param bool|\DateTime|int|string $value - */ - public function __construct($value = '') { - $this->value = $value; - } - - +class Literal extends \SearchDAV\Query\Literal implements XmlDeserializable { static function xmlDeserialize(Reader $reader) { $literal = new self(); diff --git a/src/XML/Operator.php b/src/XML/Operator.php index a9343f5..6439ff6 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -21,28 +21,14 @@ namespace SearchDAV\XML; - use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; class Operator implements XmlDeserializable { - const OPERATION_AND = '{DAV:}and'; - const OPERATION_OR = '{DAV:}or'; - const OPERATION_NOT = '{DAV:}not'; - const OPERATION_EQUAL = '{DAV:}eq'; - const OPERATION_LESS_THAN = '{DAV:}lt'; - const OPERATION_LESS_OR_EQUAL_THAN = '{DAV:}lte'; - const OPERATION_GREATER_THAN = '{DAV:}gt'; - const OPERATION_GREATER_OR_EQUAL_THAN = '{DAV:}gte'; - const OPERATION_IS_COLLECTION = '{DAV:}is-collection'; - const OPERATION_IS_DEFINED = '{DAV:}is-defined'; - const OPERATION_IS_LIKE = '{DAV:}like'; - const OPERATION_CONTAINS = '{DAV:}contains'; - /** * @var string * - * The type of operation, one of the Operation::OPERATION_* constants + * The type of operation, one of the Operator::OPERATION_* constants */ public $type; /** @@ -69,7 +55,6 @@ class Operator implements XmlDeserializable { $this->arguments = $arguments; } - static function xmlDeserialize(Reader $reader) { $operator = new self(); diff --git a/src/XML/Order.php b/src/XML/Order.php index 15c5517..6573473 100644 --- a/src/XML/Order.php +++ b/src/XML/Order.php @@ -26,9 +26,6 @@ use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; class Order implements XmlDeserializable { - const ASC = 'ascending'; - const DESC = 'descending'; - /** * @var string * @@ -48,7 +45,7 @@ class Order implements XmlDeserializable { * @param string $property * @param string $order */ - public function __construct($property = '', $order = self::ASC) { + public function __construct($property = '', $order = \SearchDAV\Query\Order::ASC) { $this->property = $property; $this->order = $order; } @@ -58,7 +55,7 @@ class Order implements XmlDeserializable { $childs = \Sabre\Xml\Deserializer\keyValue($reader); - $order->order = array_key_exists('{DAV:}descending', $childs) ? self::DESC : self::ASC; + $order->order = array_key_exists('{DAV:}descending', $childs) ? \SearchDAV\Query\Order::DESC : \SearchDAV\Query\Order::ASC; $order->property = $childs['{DAV:}prop'][0]; return $order; diff --git a/src/XML/Scope.php b/src/XML/Scope.php index 9bc8303..905e140 100644 --- a/src/XML/Scope.php +++ b/src/XML/Scope.php @@ -21,46 +21,10 @@ namespace SearchDAV\XML; - use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -class Scope implements XmlDeserializable { - /** - * @var string - * - * The scope of the search, either as absolute uri or as a path relative to the - * search arbiter. - */ - public $href; - - /** - * @var string|int 0, 1 or 'infinite' - * - * How deep the search query should be with 0 being only the scope itself, - * 1 being all direct child entries of the scope and infinite being all entries - * in the scope collection at any depth. - */ - public $depth; - - /** - * @var string|null - * - * the path of the search scope relative to the dav server, or null if the scope is outside the dav server - */ - public $path; - - /** - * @param string $href - * @param int|string $depth - * @param string|null $path - */ - public function __construct($href = '', $depth = 1, $path = null) { - $this->href = $href; - $this->depth = $depth; - $this->path = $path; - } - +class Scope extends \SearchDAV\Query\Scope implements XmlDeserializable { static function xmlDeserialize(Reader $reader) { $scope = new self(); diff --git a/tests/DummyBackend.php b/tests/DummyBackend.php index c9e7bfc..f5da86c 100644 --- a/tests/DummyBackend.php +++ b/tests/DummyBackend.php @@ -26,6 +26,7 @@ use Sabre\DAV\INode; use Sabre\DAV\SimpleFile; use SearchDAV\Backend\ISearchBackend; use SearchDAV\Backend\SearchResult; +use SearchDAV\Query\Query; use SearchDAV\XML\BasicSearch; use SearchDAV\Backend\SearchPropertyDefinition; @@ -47,7 +48,7 @@ class DummyBackend implements ISearchBackend { ]; } - public function search(BasicSearch $query) { + public function search(Query $query) { return [ new SearchResult(new SimpleFile('foo.txt', 'foobar', 'text/plain'), '/bar/foo.txt') ]; diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index 66550e9..2ff8543 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -50,12 +50,12 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { $this->assertEquals([ new Scope('/container1/', 'infinity') ], $search->from); - $this->assertEquals(new Operator(Operator::OPERATION_GREATER_THAN, [ + $this->assertEquals(new Operator(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, [ '{DAV:}getcontentlength', new Literal(10000) ]), $search->where); $this->assertEquals([ - new Order('{DAV:}getcontentlength', Order::ASC) + new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::ASC) ], $search->orderBy); } @@ -75,12 +75,12 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { $this->assertEquals([ new Scope('/container1/', 'infinity') ], $search->from); - $this->assertEquals(new Operator(Operator::OPERATION_GREATER_THAN, [ + $this->assertEquals(new Operator(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, [ '{DAV:}getcontentlength', new Literal(10000) ]), $search->where); $this->assertEquals([ - new Order('{DAV:}getcontentlength', Order::DESC) + new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::DESC) ], $search->orderBy); } @@ -101,7 +101,7 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { new Scope('/container1/', 'infinity'), new Scope('/container2/', 1), ], $search->from); - $this->assertEquals(new Operator(Operator::OPERATION_IS_COLLECTION, []), $search->where); + $this->assertEquals(new Operator(\SearchDAV\Query\Operator::OPERATION_IS_COLLECTION, []), $search->where); $this->assertEquals([], $search->orderBy); } diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index 260a490..351fafe 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -34,6 +34,7 @@ use SearchDAV\Backend\ISearchBackend; use SearchDAV\Backend\SearchPropertyDefinition; use SearchDAV\Backend\SearchResult; use SearchDAV\DAV\SearchPlugin; +use SearchDAV\Query\Query; use SearchDAV\XML\BasicSearch; use SearchDAV\XML\Limit; use SearchDAV\XML\Literal; @@ -275,19 +276,20 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->method('isValidScope') ->willReturn(true); - $query = new BasicSearch(); - $query->orderBy = [ - new Order('{DAV:}getcontentlength', Order::ASC) + $lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER); + $orderBy = [ + new \SearchDAV\Query\Order($lengthProp, \SearchDAV\Query\Order::ASC) ]; - $query->select = ['{DAV:}getcontentlength']; - $query->from = [ + $select = [$lengthProp]; + $from = [ new Scope('/container1/', 'infinity', '/container1/') ]; - $query->where = new Operator(Operator::OPERATION_GREATER_THAN, [ - '{DAV:}getcontentlength', + $where = new \SearchDAV\Query\Operator(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, [ + $lengthProp, new Literal(10000) ]); - $query->limit = new Limit(); + $limit = new Limit(); + $query = new Query($select, $from, $where, $orderBy, $limit); $this->searchBackend->expects($this->once()) ->method('search') @@ -299,6 +301,12 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ) ]); + $this->searchBackend->expects($this->any()) + ->method('getPropertyDefinitionsForScope') + ->willReturn([ + $lengthProp + ]); + $plugin->searchHandler($request, $response); $parser = new Service(); @@ -439,4 +447,39 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->assertEquals(new SupportedQueryGrammar(), $propFind->get('{DAV:}supported-query-grammar-set')); } + + public function testSearchQueryInvalidWhere() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/invalidwhere.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); + + $this->searchBackend->expects($this->never()) + ->method('search'); + + $this->searchBackend->expects($this->once()) + ->method('getPropertyDefinitionsForScope') + ->willReturn([ + new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + ]); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + } diff --git a/tests/invalidwhere.xml b/tests/invalidwhere.xml new file mode 100644 index 0000000..7cbc0e6 --- /dev/null +++ b/tests/invalidwhere.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + /container1/ + infinity + + + + + + + + 5 + + + + + + + + + + + + From a78fd79b7c3773ac74560a85a40fc96d4797d037 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jan 2018 14:52:08 +0100 Subject: [PATCH 13/47] load phpunit from vendor --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b26f688..0899c8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ install: script: - cd tests - - phpunit --coverage-clover coverage.xml --configuration phpunit.xml + - ../vendor/bin/phpunit --coverage-clover coverage.xml --configuration phpunit.xml after_success: - bash <(curl -s https://codecov.io/bash) From c842f45ed6c2a32b2c2596543588ce7fccb37657 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jan 2018 14:56:57 +0100 Subject: [PATCH 14/47] fix license identifier --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2d5da56..242db29 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "icewind/searchdav", "description": "sabre/dav plugin to implement rfc5323 SEARCH", - "license": "AGPL", + "license": "AGPL-3.0-or-later", "authors": [ { "name": "Robin Appelman", From 55f248fa5321003a16c2949f0879f2c5469f1e0e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jan 2018 14:57:55 +0100 Subject: [PATCH 15/47] update readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ce99ec5..1ae78d1 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,9 @@ the search schema that is supported and implements the actual search. For a full list of methods required and their description see [`ISearchBackend.php`](src/Backend/ISearchBackend.php) -### BasicSearch +### Query -The `BasicSearch` class defines the query that was made by the client and consists of four parts: +The `Query` class defines the query that was made by the client and consists of four parts: - select: the properties are requested. - from: the scope(s) in which the search should be made. @@ -58,5 +58,5 @@ The `BasicSearch` class defines the query that was made by the client and consis - orderBy: how the search results should be ordered. For further information about these elements see - [`BasicSearch.php`](src/XML/BasicSearch.php), [`Scope.php`](src/XML/Scope.php), - [`Operator.php`](src/XML/Operator.php) and [`Order.php`](src/XML/Order.php) + [`Query.php`](src/Query/Query.php), [`Scope.php`](src/Query/Scope.php), + [`Operator.php`](src/Query/Operator.php) and [`Order.php`](src/Query/Order.php) From 282bdeea56e9d5991163a6181439dfcd2d64efcd Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 25 Jan 2018 14:59:28 +0100 Subject: [PATCH 16/47] test with php 7.2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0899c8e..5d7c956 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ php: - '5.6' - '7.0' - '7.1' + - '7.2' cache: directories: From a292d9402ac4610876380466f1000b1ac9190bca Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 22 Mar 2018 16:50:59 +0100 Subject: [PATCH 17/47] No need to error out if the propery can't be found Just don't search for it if it is not allowed. But we can still continue. Webdav will give a 404 if it can't be found later anyway. Signed-off-by: Roeland Jago Douma --- src/DAV/SearchHandler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index 132e793..f27bbeb 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -112,7 +112,7 @@ class SearchHandler { }, $xml->orderBy); $select = array_map(function ($propName) use ($allProps) { if (!isset($allProps[$propName])) { - throw new BadRequest('requested property is not a valid property for this scope'); + return; } $prop = $allProps[$propName]; if (!$prop->selectable) { @@ -120,6 +120,7 @@ class SearchHandler { } return $prop; }, $xml->select); + $select = array_filter($select); $where = $this->transformOperator($xml->where, $allProps); From 6d421fc4ec9d14e317de6efef06893c28a9c1fba Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Thu, 22 Mar 2018 16:04:24 +0000 Subject: [PATCH 18/47] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- src/DAV/SearchHandler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index f27bbeb..ab400ce 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -100,7 +100,7 @@ class SearchHandler { * @return Query */ private function getQueryForXML(BasicSearch $xml, array $allProps) { - $orderBy = array_map(function (\SearchDAV\XML\Order $order) use ($allProps) { + $orderBy = array_map(function(\SearchDAV\XML\Order $order) use ($allProps) { if (!isset($allProps[$order->property])) { throw new BadRequest('requested order by property is not a valid property for this scope'); } @@ -110,7 +110,7 @@ class SearchHandler { } return new Order($prop, $order->order); }, $xml->orderBy); - $select = array_map(function ($propName) use ($allProps) { + $select = array_map(function($propName) use ($allProps) { if (!isset($allProps[$propName])) { return; } @@ -128,7 +128,7 @@ class SearchHandler { } private function transformOperator(\SearchDAV\XML\Operator $operator, array $allProps) { - $arguments = array_map(function ($argument) use ($allProps) { + $arguments = array_map(function($argument) use ($allProps) { if (is_string($argument)) { if (!isset($allProps[$argument])) { throw new BadRequest('requested search property is not a valid property for this scope'); From e8cf5e7644640238b07124a361fad3f5d1ec5db3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Feb 2019 15:43:12 +0100 Subject: [PATCH 19/47] strict typing and php 7.1 --- composer.json | 2 +- src/Backend/ISearchBackend.php | 2 +- src/Backend/SearchPropertyDefinition.php | 2 +- src/Backend/SearchResult.php | 2 +- src/DAV/DiscoverHandler.php | 2 +- src/DAV/PathHelper.php | 2 +- src/DAV/QueryParser.php | 2 +- src/DAV/SearchHandler.php | 9 ++++++++- src/DAV/SearchPlugin.php | 2 +- src/Query/Limit.php | 2 +- src/Query/Literal.php | 2 +- src/Query/Operator.php | 4 ++-- src/Query/Order.php | 4 ++-- src/Query/Query.php | 2 +- src/Query/Scope.php | 4 ++-- src/XML/BasicSearch.php | 4 ++-- src/XML/BasicSearchSchema.php | 2 +- src/XML/Limit.php | 4 ++-- src/XML/Literal.php | 4 ++-- src/XML/Operator.php | 6 +++--- src/XML/Order.php | 6 +++--- src/XML/PropDesc.php | 2 +- src/XML/QueryDiscoverResponse.php | 2 +- src/XML/Scope.php | 4 ++-- src/XML/SupportedQueryGrammar.php | 2 +- 25 files changed, 43 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index 242db29..52b8e58 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ } ], "require": { - "php": ">=5.6", + "php": ">=7.1", "sabre/dav": "^3.2.0" }, "require-dev": { diff --git a/src/Backend/ISearchBackend.php b/src/Backend/ISearchBackend.php index 665666c..21d577b 100644 --- a/src/Backend/ISearchBackend.php +++ b/src/Backend/ISearchBackend.php @@ -1,4 +1,4 @@ - * diff --git a/src/Backend/SearchPropertyDefinition.php b/src/Backend/SearchPropertyDefinition.php index d7de46a..daa22bd 100644 --- a/src/Backend/SearchPropertyDefinition.php +++ b/src/Backend/SearchPropertyDefinition.php @@ -1,4 +1,4 @@ - * diff --git a/src/Backend/SearchResult.php b/src/Backend/SearchResult.php index 32f99a7..43ee333 100644 --- a/src/Backend/SearchResult.php +++ b/src/Backend/SearchResult.php @@ -1,4 +1,4 @@ - * diff --git a/src/DAV/DiscoverHandler.php b/src/DAV/DiscoverHandler.php index 675fd6a..62fb5f8 100644 --- a/src/DAV/DiscoverHandler.php +++ b/src/DAV/DiscoverHandler.php @@ -1,4 +1,4 @@ - * diff --git a/src/DAV/PathHelper.php b/src/DAV/PathHelper.php index de7ea6a..b572493 100644 --- a/src/DAV/PathHelper.php +++ b/src/DAV/PathHelper.php @@ -1,4 +1,4 @@ - * diff --git a/src/DAV/QueryParser.php b/src/DAV/QueryParser.php index 592b620..44c594b 100644 --- a/src/DAV/QueryParser.php +++ b/src/DAV/QueryParser.php @@ -1,4 +1,4 @@ - * diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index ab400ce..b6e3d2a 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -1,4 +1,4 @@ - * @@ -98,6 +98,7 @@ class SearchHandler { * @param BasicSearch $xml * @param SearchPropertyDefinition[] $allProps * @return Query + * @throws BadRequest */ private function getQueryForXML(BasicSearch $xml, array $allProps) { $orderBy = array_map(function(\SearchDAV\XML\Order $order) use ($allProps) { @@ -127,6 +128,12 @@ class SearchHandler { return new Query($select, $xml->from, $where, $orderBy, $xml->limit); } + /** + * @param \SearchDAV\XML\Operator $operator + * @param array $allProps + * @return Operator + * @throws BadRequest + */ private function transformOperator(\SearchDAV\XML\Operator $operator, array $allProps) { $arguments = array_map(function($argument) use ($allProps) { if (is_string($argument)) { diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 98c3ae9..113010b 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -1,4 +1,4 @@ - * diff --git a/src/Query/Limit.php b/src/Query/Limit.php index 0619e02..e6b4867 100644 --- a/src/Query/Limit.php +++ b/src/Query/Limit.php @@ -1,4 +1,4 @@ - * diff --git a/src/Query/Literal.php b/src/Query/Literal.php index 58b2fdd..862a412 100644 --- a/src/Query/Literal.php +++ b/src/Query/Literal.php @@ -1,4 +1,4 @@ - * diff --git a/src/Query/Operator.php b/src/Query/Operator.php index 868557b..198d1fb 100644 --- a/src/Query/Operator.php +++ b/src/Query/Operator.php @@ -1,4 +1,4 @@ - * @@ -60,7 +60,7 @@ class Operator { * @param string $type * @param array $arguments */ - public function __construct($type = '', array $arguments = []) { + public function __construct(string $type = '', array $arguments = []) { $this->type = $type; $this->arguments = $arguments; } diff --git a/src/Query/Order.php b/src/Query/Order.php index 5266658..c6afcee 100644 --- a/src/Query/Order.php +++ b/src/Query/Order.php @@ -1,4 +1,4 @@ - * @@ -46,7 +46,7 @@ class Order { * @param SearchPropertyDefinition $property * @param string $order */ - public function __construct(SearchPropertyDefinition $property, $order) { + public function __construct(SearchPropertyDefinition $property, string $order) { $this->property = $property; $this->order = $order; } diff --git a/src/Query/Query.php b/src/Query/Query.php index 85fc1ed..efd367c 100644 --- a/src/Query/Query.php +++ b/src/Query/Query.php @@ -1,4 +1,4 @@ - * diff --git a/src/Query/Scope.php b/src/Query/Scope.php index ebc778d..9c342c8 100644 --- a/src/Query/Scope.php +++ b/src/Query/Scope.php @@ -1,4 +1,4 @@ - * @@ -52,7 +52,7 @@ class Scope { * @param int|string $depth * @param string|null $path */ - public function __construct($href = '', $depth = 1, $path = null) { + public function __construct(string $href = '', $depth = 1, string $path = null) { $this->href = $href; $this->depth = $depth; $this->path = $path; diff --git a/src/XML/BasicSearch.php b/src/XML/BasicSearch.php index 8af30f4..269edb0 100644 --- a/src/XML/BasicSearch.php +++ b/src/XML/BasicSearch.php @@ -1,4 +1,4 @@ - * @@ -70,7 +70,7 @@ class BasicSearch implements XmlDeserializable { * @return BasicSearch * @throws ParseException */ - static function xmlDeserialize(Reader $reader) { + static function xmlDeserialize(Reader $reader): BasicSearch { $search = new self(); $elements = \Sabre\Xml\Deserializer\keyValue($reader); diff --git a/src/XML/BasicSearchSchema.php b/src/XML/BasicSearchSchema.php index 0e4c30d..edda372 100644 --- a/src/XML/BasicSearchSchema.php +++ b/src/XML/BasicSearchSchema.php @@ -1,4 +1,4 @@ - * diff --git a/src/XML/Limit.php b/src/XML/Limit.php index 0179d40..26d7866 100644 --- a/src/XML/Limit.php +++ b/src/XML/Limit.php @@ -1,4 +1,4 @@ - * @@ -29,7 +29,7 @@ use SearchDAV\DAV\SearchPlugin; * The limit and offset of a search query */ class Limit extends \SearchDAV\Query\Limit implements XmlDeserializable { - static function xmlDeserialize(Reader $reader) { + static function xmlDeserialize(Reader $reader): Limit { $limit = new self(); $elements = \Sabre\Xml\Deserializer\keyValue($reader); diff --git a/src/XML/Literal.php b/src/XML/Literal.php index 03d167f..f368940 100644 --- a/src/XML/Literal.php +++ b/src/XML/Literal.php @@ -1,4 +1,4 @@ - * @@ -26,7 +26,7 @@ use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; class Literal extends \SearchDAV\Query\Literal implements XmlDeserializable { - static function xmlDeserialize(Reader $reader) { + static function xmlDeserialize(Reader $reader): Literal { $literal = new self(); $literal->value = $reader->readText(); diff --git a/src/XML/Operator.php b/src/XML/Operator.php index 6439ff6..b3de50e 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -1,4 +1,4 @@ - * @@ -50,12 +50,12 @@ class Operator implements XmlDeserializable { * @param string $type * @param array $arguments */ - public function __construct($type = '', array $arguments = []) { + public function __construct(string $type = '', array $arguments = []) { $this->type = $type; $this->arguments = $arguments; } - static function xmlDeserialize(Reader $reader) { + static function xmlDeserialize(Reader $reader): Operator { $operator = new self(); $operator->type = $reader->getClark(); diff --git a/src/XML/Order.php b/src/XML/Order.php index 6573473..7aae162 100644 --- a/src/XML/Order.php +++ b/src/XML/Order.php @@ -1,4 +1,4 @@ - * @@ -45,12 +45,12 @@ class Order implements XmlDeserializable { * @param string $property * @param string $order */ - public function __construct($property = '', $order = \SearchDAV\Query\Order::ASC) { + public function __construct(string $property = '', string $order = \SearchDAV\Query\Order::ASC) { $this->property = $property; $this->order = $order; } - static function xmlDeserialize(Reader $reader) { + static function xmlDeserialize(Reader $reader): Order { $order = new self(); $childs = \Sabre\Xml\Deserializer\keyValue($reader); diff --git a/src/XML/PropDesc.php b/src/XML/PropDesc.php index 85e0c63..ab503b3 100644 --- a/src/XML/PropDesc.php +++ b/src/XML/PropDesc.php @@ -1,4 +1,4 @@ - * diff --git a/src/XML/QueryDiscoverResponse.php b/src/XML/QueryDiscoverResponse.php index b564b3b..802fdcd 100644 --- a/src/XML/QueryDiscoverResponse.php +++ b/src/XML/QueryDiscoverResponse.php @@ -1,4 +1,4 @@ - * diff --git a/src/XML/Scope.php b/src/XML/Scope.php index 905e140..78d4ba4 100644 --- a/src/XML/Scope.php +++ b/src/XML/Scope.php @@ -1,4 +1,4 @@ - * @@ -25,7 +25,7 @@ use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; class Scope extends \SearchDAV\Query\Scope implements XmlDeserializable { - static function xmlDeserialize(Reader $reader) { + static function xmlDeserialize(Reader $reader): Scope { $scope = new self(); $values = \Sabre\Xml\Deserializer\keyValue($reader); diff --git a/src/XML/SupportedQueryGrammar.php b/src/XML/SupportedQueryGrammar.php index 9b17a9b..ddb4e33 100644 --- a/src/XML/SupportedQueryGrammar.php +++ b/src/XML/SupportedQueryGrammar.php @@ -1,4 +1,4 @@ - * From aeb761058969f82a7495ffb68c1bf4c7ba20e979 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Feb 2019 18:02:24 +0100 Subject: [PATCH 20/47] "where" is optional --- src/DAV/SearchHandler.php | 7 +------ src/Query/Query.php | 4 ++-- tests/SearchPluginTest.php | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index b6e3d2a..15cad4d 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -62,11 +62,6 @@ class SearchHandler { } /** @var BasicSearch $query */ $query = $xml['{DAV:}basicsearch']; - if (!$query->where) { - $response->setStatus(400); - $response->setBody('Parse error: Missing {DAV:}where from {DAV:}basicsearch'); - return false; - } if (!$query->select) { $response->setStatus(400); $response->setBody('Parse error: Missing {DAV:}select from {DAV:}basicsearch'); @@ -123,7 +118,7 @@ class SearchHandler { }, $xml->select); $select = array_filter($select); - $where = $this->transformOperator($xml->where, $allProps); + $where = $xml->where ? $this->transformOperator($xml->where, $allProps) : null; return new Query($select, $xml->from, $where, $orderBy, $xml->limit); } diff --git a/src/Query/Query.php b/src/Query/Query.php index efd367c..613c369 100644 --- a/src/Query/Query.php +++ b/src/Query/Query.php @@ -65,11 +65,11 @@ class Query { * Query constructor. * @param SearchPropertyDefinition[] $select * @param Scope[] $from - * @param Operator $where + * @param Operator|null $where * @param Order[] $orderBy * @param Limit $limit */ - public function __construct(array $select, array $from, Operator $where, array $orderBy, Limit $limit) { + public function __construct(array $select, array $from, ?Operator $where, array $orderBy, Limit $limit) { $this->select = $select; $this->from = $from; $this->where = $where; diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index 351fafe..f6df61c 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -348,6 +348,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->method('getArbiterPath') ->willReturn('foo'); + $lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER); $plugin = new SearchPlugin($this->searchBackend); $server = new Server(); $plugin->initialize($server); @@ -363,12 +364,20 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->method('isValidScope') ->willReturn(true); - $this->searchBackend->expects($this->never()) - ->method('search'); + $this->searchBackend->expects($this->any()) + ->method('getPropertyDefinitionsForScope') + ->willReturn([$lengthProp]); + + $this->searchBackend->expects($this->once()) + ->method('search') + ->willReturnCallback(function(Query $query) { + $this->assertNull($query->where); + return []; + }); $plugin->searchHandler($request, $response); - $this->assertEquals(400, $response->getStatus()); + $this->assertEquals(207, $response->getStatus()); } public function testSearchQueryNoSelect() { From 9c24c70774d5c9f05618166d0a860d6dd52e3591 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 20 Feb 2019 18:02:49 +0100 Subject: [PATCH 21/47] update php versions for travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d7c956..2236f26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: php php: - - '5.6' - - '7.0' - '7.1' - '7.2' + - '7.3' cache: directories: From bef5795c984f277d2b814f3715a93151e276d415 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 3 Nov 2019 11:34:31 +0100 Subject: [PATCH 22/47] Fix parsing of {DAV:}contains element --- src/XML/Operator.php | 8 ++++++++ tests/QueryParserTest.php | 34 ++++++++++++++++++++++++++++++++ tests/complexquery.xml | 41 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 tests/complexquery.xml diff --git a/src/XML/Operator.php b/src/XML/Operator.php index b3de50e..d4089de 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -23,6 +23,7 @@ namespace SearchDAV\XML; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; +use SearchDAV\Query\Operator as QueryOperator; class Operator implements XmlDeserializable { /** @@ -63,6 +64,13 @@ class Operator implements XmlDeserializable { $reader->next(); return $operator; } + + if ($operator->type === QueryOperator::OPERATION_CONTAINS) { + $operator->arguments[] = $reader->readString(); + $reader->next(); + return $operator; + } + $reader->read(); do { if ($reader->nodeType === Reader::ELEMENT) { diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index 2ff8543..57ffb00 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -142,4 +142,38 @@ class QueryParserTest extends \PHPUnit_Framework_TestCase { $limit->maxResults = 10; $this->assertEquals($limit, $search->limit); } + + public function testParseComplexQuery() { + $query = file_get_contents(__DIR__ . '/complexquery.xml'); + $parser = new QueryParser(); + $xml = $parser->parse($query, null, $rootElementName); + + $this->assertEquals('{DAV:}searchrequest', $rootElementName); + $this->assertArrayHasKey('{DAV:}basicsearch', $xml); + + /** @var BasicSearch $search */ + $search = $xml['{DAV:}basicsearch']; + $this->assertInstanceOf(BasicSearch::class, $search); + + $this->assertEquals(['{DAV:}getcontentlength'], $search->select); + $this->assertEquals([ + new Scope('/container1/', 'infinity') + ], $search->from); + $this->assertEquals(new Operator(\SearchDAV\Query\Operator::OPERATION_AND, [ + new Operator(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, [ + '{DAV:}getcontentlength', + new Literal(10000) + ]), + new Operator(\SearchDAV\Query\Operator::OPERATION_LESS_THAN, [ + '{DAV:}getcontentlength', + new Literal(90000) + ]), + new Operator(\SearchDAV\Query\Operator::OPERATION_CONTAINS, [ + 'Peter Forsberg' + ]), + ]), $search->where); + $this->assertEquals([ + new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::ASC) + ], $search->orderBy); + } } diff --git a/tests/complexquery.xml b/tests/complexquery.xml new file mode 100644 index 0000000..a29c85b --- /dev/null +++ b/tests/complexquery.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + /container1/ + infinity + + + + + + + + + 10000 + + + + + + 90000 + + Peter Forsberg + + + + + + + + + + + + From f9b08747fc3e9e926e462dac31dbba15ecbd47e3 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 3 Nov 2019 15:36:34 +0100 Subject: [PATCH 23/47] Fix Undefined offset: 0 --- src/XML/Operator.php | 2 +- tests/SearchPluginTest.php | 35 +++++++++++++++++++++++++++++++++++ tests/invalidwherenoprop.xml | 30 ++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 tests/invalidwherenoprop.xml diff --git a/src/XML/Operator.php b/src/XML/Operator.php index b3de50e..14ee8e8 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -68,7 +68,7 @@ class Operator implements XmlDeserializable { if ($reader->nodeType === Reader::ELEMENT) { $argument = $reader->parseCurrentElement(); if ($argument['name'] === '{DAV:}prop') { - $operator->arguments[] = $argument['value'][0]; + $operator->arguments[] = $argument['value'][0] ?? ''; } else { $operator->arguments[] = $argument['value']; } diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index f6df61c..6fabea2 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -491,4 +491,39 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->assertEquals(400, $response->getStatus()); } + public function testSearchQueryInvalidWhereNoProp() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/invalidwherenoprop.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); + + $this->searchBackend->expects($this->never()) + ->method('search'); + + $this->searchBackend->expects($this->any()) + ->method('getPropertyDefinitionsForScope') + ->willReturn([ + new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + ]); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + } diff --git a/tests/invalidwherenoprop.xml b/tests/invalidwherenoprop.xml new file mode 100644 index 0000000..8613100 --- /dev/null +++ b/tests/invalidwherenoprop.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + /container1/ + infinity + + + + + + + + + + + + + + + + + + \ No newline at end of file From faf4ef87fd150e7c6d4c5a341211f6d22e2d5d1e Mon Sep 17 00:00:00 2001 From: Naofumi Date: Fri, 1 Nov 2019 07:59:07 +0900 Subject: [PATCH 24/47] Fix a possible infinite loop. --- src/XML/Operator.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/XML/Operator.php b/src/XML/Operator.php index 21d0236..61f410a 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -81,7 +81,9 @@ class Operator implements XmlDeserializable { $operator->arguments[] = $argument['value']; } } else { - $reader->read(); + if (!$reader->read()) { + break; + } } } while ($reader->nodeType !== Reader::END_ELEMENT); From c880b7edcdd406a474d2cbeebcb8a77cc5cfacf5 Mon Sep 17 00:00:00 2001 From: Naofumi Date: Wed, 6 Nov 2019 12:14:53 +0900 Subject: [PATCH 25/47] Don't call readText() in an empty element, otherwise all the subsequent elements are exhausted. --- src/XML/Literal.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/XML/Literal.php b/src/XML/Literal.php index f368940..92c76ca 100644 --- a/src/XML/Literal.php +++ b/src/XML/Literal.php @@ -29,7 +29,12 @@ class Literal extends \SearchDAV\Query\Literal implements XmlDeserializable { static function xmlDeserialize(Reader $reader): Literal { $literal = new self(); - $literal->value = $reader->readText(); + if ($reader->isEmptyElement) { + $literal->value = ''; + } else { + $literal->value = $reader->readText(); + } + $reader->read(); return $literal; From 2f87fb84d3d4d23d344407585f626d97f1cd991c Mon Sep 17 00:00:00 2001 From: Naofumi Date: Wed, 6 Nov 2019 12:14:18 +0900 Subject: [PATCH 26/47] add testSearchQueryInfiniteLoopEmptyLiteral(). --- tests/SearchPluginTest.php | 28 ++++++++++++++++++++++++++++ tests/infiniteloopemptyliteral.xml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 tests/infiniteloopemptyliteral.xml diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index 6fabea2..d7d0d00 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -526,4 +526,32 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->assertEquals(400, $response->getStatus()); } + public function testSearchQueryInfiniteLoopEmptyLiteral() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); + + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); + + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml' + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/infiniteloopemptyliteral.xml', 'r')); + $response = new Response(); + + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); + + $this->searchBackend->expects($this->never()) + ->method('search'); + + $plugin->searchHandler($request, $response); + + $this->assertEquals(400, $response->getStatus()); + } + } diff --git a/tests/infiniteloopemptyliteral.xml b/tests/infiniteloopemptyliteral.xml new file mode 100644 index 0000000..7fa428a --- /dev/null +++ b/tests/infiniteloopemptyliteral.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + /files/naofumi + infinity + + + + + + \ No newline at end of file From 7174c023485c23037c6af786fce5a382fc72a75d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 6 Nov 2019 14:15:26 +0100 Subject: [PATCH 27/47] fix test --- src/DAV/SearchHandler.php | 17 +++--- tests/SearchPluginTest.php | 118 +++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 58 deletions(-) diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index 15cad4d..8f6483e 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -84,7 +84,8 @@ class SearchHandler { $response->setBody($e->getMessage()); return false; } - $data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults($results, $query->select)), false); + $data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults($results, + $query->select)), false); $response->setBody($data); return false; } @@ -96,7 +97,7 @@ class SearchHandler { * @throws BadRequest */ private function getQueryForXML(BasicSearch $xml, array $allProps) { - $orderBy = array_map(function(\SearchDAV\XML\Order $order) use ($allProps) { + $orderBy = array_map(function (\SearchDAV\XML\Order $order) use ($allProps) { if (!isset($allProps[$order->property])) { throw new BadRequest('requested order by property is not a valid property for this scope'); } @@ -106,7 +107,7 @@ class SearchHandler { } return new Order($prop, $order->order); }, $xml->orderBy); - $select = array_map(function($propName) use ($allProps) { + $select = array_map(function ($propName) use ($allProps) { if (!isset($allProps[$propName])) { return; } @@ -130,7 +131,7 @@ class SearchHandler { * @throws BadRequest */ private function transformOperator(\SearchDAV\XML\Operator $operator, array $allProps) { - $arguments = array_map(function($argument) use ($allProps) { + $arguments = array_map(function ($argument) use ($allProps) { if (is_string($argument)) { if (!isset($allProps[$argument])) { throw new BadRequest('requested search property is not a valid property for this scope'); @@ -140,10 +141,12 @@ class SearchHandler { throw new BadRequest('requested search property is not searchable'); } return $prop; - } else if ($argument instanceof \SearchDAV\XML\Operator) { - return $this->transformOperator($argument, $allProps); } else { - return $argument; + if ($argument instanceof \SearchDAV\XML\Operator) { + return $this->transformOperator($argument, $allProps); + } else { + return $argument; + } } }, $operator->arguments); diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index d7d0d00..89dc08d 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -60,7 +60,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->willReturn('foo'); $request = new Request('SEARCH', 'foo', [ - 'Content-Type' => 'text/plain' + 'Content-Type' => 'text/plain', ], fopen(__DIR__ . '/nofrom.xml', 'r')); $response = new Response(); @@ -75,7 +75,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->willReturn('foo'); $request = new Request('SEARCH', 'bar', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ], fopen(__DIR__ . '/nofrom.xml', 'r')); $response = new Response(); @@ -90,7 +90,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->willReturn('foo'); $request = new Request('SEARCH', 'foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ], fopen(__DIR__ . '/invalidtype.xml', 'r')); $response = new Response(); @@ -107,7 +107,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->willReturn('foo'); $request = new Request('SEARCH', 'foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ], fopen(__DIR__ . '/nofrom.xml', 'r')); $response = new Response(); @@ -171,7 +171,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/discover.xml', 'r')); @@ -184,10 +184,12 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->searchBackend->expects($this->once()) ->method('getPropertyDefinitionsForScope') ->willReturn([ - new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new SearchPropertyDefinition('{DAV:}displayname', true, true, true), - new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), ]); $plugin->searchHandler($request, $response); @@ -208,7 +210,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/discover.xml', 'r')); @@ -239,7 +241,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/invaliddiscover.xml', 'r')); @@ -266,7 +268,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/basicquery.xml', 'r')); @@ -276,17 +278,18 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->method('isValidScope') ->willReturn(true); - $lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER); + $lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER); $orderBy = [ - new \SearchDAV\Query\Order($lengthProp, \SearchDAV\Query\Order::ASC) + new \SearchDAV\Query\Order($lengthProp, \SearchDAV\Query\Order::ASC), ]; $select = [$lengthProp]; $from = [ - new Scope('/container1/', 'infinity', '/container1/') + new Scope('/container1/', 'infinity', '/container1/'), ]; $where = new \SearchDAV\Query\Operator(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, [ $lengthProp, - new Literal(10000) + new Literal(10000), ]); $limit = new Limit(); $query = new Query($select, $from, $where, $orderBy, $limit); @@ -298,13 +301,13 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { new SearchResult( new Directory('/foo'), '/foo' - ) + ), ]); $this->searchBackend->expects($this->any()) ->method('getPropertyDefinitionsForScope') ->willReturn([ - $lengthProp + $lengthProp, ]); $plugin->searchHandler($request, $response); @@ -325,7 +328,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/nofrom.xml', 'r')); @@ -348,13 +351,14 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { ->method('getArbiterPath') ->willReturn('foo'); - $lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER); + $lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER); $plugin = new SearchPlugin($this->searchBackend); $server = new Server(); $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/nowhere.xml', 'r')); @@ -370,10 +374,10 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->searchBackend->expects($this->once()) ->method('search') - ->willReturnCallback(function(Query $query) { - $this->assertNull($query->where); - return []; - }); + ->willReturnCallback(function (Query $query) { + $this->assertNull($query->where); + return []; + }); $plugin->searchHandler($request, $response); @@ -390,7 +394,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/noselect.xml', 'r')); @@ -418,7 +422,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/invalid.xml', 'r')); @@ -467,7 +471,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/invalidwhere.xml', 'r')); @@ -483,7 +487,8 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->searchBackend->expects($this->once()) ->method('getPropertyDefinitionsForScope') ->willReturn([ - new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), ]); $plugin->searchHandler($request, $response); @@ -491,40 +496,42 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->assertEquals(400, $response->getStatus()); } - public function testSearchQueryInvalidWhereNoProp() { - $this->searchBackend->expects($this->any()) - ->method('getArbiterPath') - ->willReturn('foo'); + public function testSearchQueryInvalidWhereNoProp() { + $this->searchBackend->expects($this->any()) + ->method('getArbiterPath') + ->willReturn('foo'); - $plugin = new SearchPlugin($this->searchBackend); - $server = new Server(); - $plugin->initialize($server); + $plugin = new SearchPlugin($this->searchBackend); + $server = new Server(); + $plugin->initialize($server); - $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' - ]); - $request->setBaseUrl('/index.php'); - $request->setBody(fopen(__DIR__ . '/invalidwherenoprop.xml', 'r')); - $response = new Response(); + $request = new Request('SEARCH', '/index.php/foo', [ + 'Content-Type' => 'text/xml', + ]); + $request->setBaseUrl('/index.php'); + $request->setBody(fopen(__DIR__ . '/invalidwherenoprop.xml', 'r')); + $response = new Response(); - $this->searchBackend->expects($this->any()) - ->method('isValidScope') - ->willReturn(true); + $this->searchBackend->expects($this->any()) + ->method('isValidScope') + ->willReturn(true); - $this->searchBackend->expects($this->never()) - ->method('search'); + $this->searchBackend->expects($this->never()) + ->method('search'); $this->searchBackend->expects($this->any()) ->method('getPropertyDefinitionsForScope') ->willReturn([ - new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), - new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), ]); - $plugin->searchHandler($request, $response); + $plugin->searchHandler($request, $response); - $this->assertEquals(400, $response->getStatus()); - } + $this->assertEquals(400, $response->getStatus()); + } public function testSearchQueryInfiniteLoopEmptyLiteral() { $this->searchBackend->expects($this->any()) @@ -536,7 +543,7 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $plugin->initialize($server); $request = new Request('SEARCH', '/index.php/foo', [ - 'Content-Type' => 'text/xml' + 'Content-Type' => 'text/xml', ]); $request->setBaseUrl('/index.php'); $request->setBody(fopen(__DIR__ . '/infiniteloopemptyliteral.xml', 'r')); @@ -549,6 +556,15 @@ class SearchPluginTest extends \PHPUnit_Framework_TestCase { $this->searchBackend->expects($this->never()) ->method('search'); + $this->searchBackend->expects($this->any()) + ->method('getPropertyDefinitionsForScope') + ->willReturn([ + new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + ]); + $plugin->searchHandler($request, $response); $this->assertEquals(400, $response->getStatus()); From 76953efe15a198ecfd42f9be6b2a0915903fc53d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 6 Nov 2019 14:28:07 +0100 Subject: [PATCH 28/47] update to phpunit 7 --- composer.json | 2 +- tests/PathHelperTest.php | 3 ++- tests/QueryParserTest.php | 3 ++- tests/SearchPluginTest.php | 7 ++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 52b8e58..6e7fe46 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "sabre/dav": "^3.2.0" }, "require-dev": { - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^7" }, "autoload": { "psr-4": { diff --git a/tests/PathHelperTest.php b/tests/PathHelperTest.php index 259ab2f..d0b27a1 100644 --- a/tests/PathHelperTest.php +++ b/tests/PathHelperTest.php @@ -21,10 +21,11 @@ namespace SearchDAV\Test; +use PHPUnit\Framework\TestCase; use Sabre\DAV\Server; use SearchDAV\DAV\PathHelper; -class PathHelperTest extends \PHPUnit_Framework_TestCase { +class PathHelperTest extends TestCase { public function uriProvider(){ return [ ['/', '', ''], diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index 57ffb00..974363b 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -22,6 +22,7 @@ namespace SearchDAV\Test; +use PHPUnit\Framework\TestCase; use Sabre\Xml\Service; use SearchDAV\DAV\QueryParser; use SearchDAV\XML\BasicSearch; @@ -33,7 +34,7 @@ use SearchDAV\XML\Scope; use SearchDAV\XML\SupportedQueryGrammar; -class QueryParserTest extends \PHPUnit_Framework_TestCase { +class QueryParserTest extends TestCase { public function testParseBasicQuery() { $query = file_get_contents(__DIR__ . '/basicquery.xml'); $parser = new QueryParser(); diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index 89dc08d..b22dff6 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -22,6 +22,7 @@ namespace SearchDAV\Test; +use PHPUnit\Framework\TestCase; use Sabre\DAV\FS\Directory; use Sabre\DAV\INode; use Sabre\DAV\PropFind; @@ -29,21 +30,17 @@ use Sabre\DAV\Server; use Sabre\DAV\Xml\Service; use Sabre\HTTP\Request; use Sabre\HTTP\Response; -use Sabre\VObject\Parser\XML; use SearchDAV\Backend\ISearchBackend; use SearchDAV\Backend\SearchPropertyDefinition; use SearchDAV\Backend\SearchResult; use SearchDAV\DAV\SearchPlugin; use SearchDAV\Query\Query; -use SearchDAV\XML\BasicSearch; use SearchDAV\XML\Limit; use SearchDAV\XML\Literal; -use SearchDAV\XML\Operator; -use SearchDAV\XML\Order; use SearchDAV\XML\Scope; use SearchDAV\XML\SupportedQueryGrammar; -class SearchPluginTest extends \PHPUnit_Framework_TestCase { +class SearchPluginTest extends TestCase { /** @var ISearchBackend|\PHPUnit_Framework_MockObject_MockObject */ private $searchBackend; From 5ba2a3cc31d6726f245b5e3bc31d21e7dd55c600 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 6 Nov 2019 14:33:04 +0100 Subject: [PATCH 29/47] add some type hinting --- src/DAV/DiscoverHandler.php | 4 ++-- src/DAV/PathHelper.php | 2 +- src/DAV/SearchHandler.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DAV/DiscoverHandler.php b/src/DAV/DiscoverHandler.php index 62fb5f8..e5a48a1 100644 --- a/src/DAV/DiscoverHandler.php +++ b/src/DAV/DiscoverHandler.php @@ -80,7 +80,7 @@ class DiscoverHandler { return false; } - private function hashDefinition(SearchPropertyDefinition $definition) { + private function hashDefinition(SearchPropertyDefinition $definition): string { return $definition->dataType . (($definition->searchable) ? '1' : '0') . (($definition->sortable) ? '1' : '0') @@ -91,7 +91,7 @@ class DiscoverHandler { * @param SearchPropertyDefinition[] $propertyDefinitions * @return BasicSearchSchema */ - private function getBasicSearchForProperties(array $propertyDefinitions) { + private function getBasicSearchForProperties(array $propertyDefinitions): BasicSearchSchema { /** @var PropDesc[] $groups */ $groups = []; foreach ($propertyDefinitions as $propertyDefinition) { diff --git a/src/DAV/PathHelper.php b/src/DAV/PathHelper.php index b572493..2c0faef 100644 --- a/src/DAV/PathHelper.php +++ b/src/DAV/PathHelper.php @@ -37,7 +37,7 @@ class PathHelper { $this->server = $server; } - public function getPathFromUri($uri) { + public function getPathFromUri($uri): ?string { if (strpos($uri, '://') === false) { return $uri; } diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index 8f6483e..85fe43b 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -96,7 +96,7 @@ class SearchHandler { * @return Query * @throws BadRequest */ - private function getQueryForXML(BasicSearch $xml, array $allProps) { + private function getQueryForXML(BasicSearch $xml, array $allProps): Query { $orderBy = array_map(function (\SearchDAV\XML\Order $order) use ($allProps) { if (!isset($allProps[$order->property])) { throw new BadRequest('requested order by property is not a valid property for this scope'); @@ -109,7 +109,7 @@ class SearchHandler { }, $xml->orderBy); $select = array_map(function ($propName) use ($allProps) { if (!isset($allProps[$propName])) { - return; + return null; } $prop = $allProps[$propName]; if (!$prop->selectable) { @@ -130,7 +130,7 @@ class SearchHandler { * @return Operator * @throws BadRequest */ - private function transformOperator(\SearchDAV\XML\Operator $operator, array $allProps) { + private function transformOperator(\SearchDAV\XML\Operator $operator, array $allProps): Operator { $arguments = array_map(function ($argument) use ($allProps) { if (is_string($argument)) { if (!isset($allProps[$argument])) { @@ -167,7 +167,7 @@ class SearchHandler { * @param int $depth * @return \Iterator */ - private function getPropertiesIteratorResults($results, $propertyNames = [], $depth = 0) { + private function getPropertiesIteratorResults($results, $propertyNames = [], $depth = 0): \Iterator { $propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS; foreach ($results as $result) { From 1ee911ba45d0f0e607ed7fc5aa7f4eab25e04328 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Wed, 6 Nov 2019 17:01:22 +0100 Subject: [PATCH 30/47] Add test case for !$reader->read then break --- src/XML/Operator.php | 6 +++--- tests/QueryParserTest.php | 13 +++++++++++++ tests/invalidwherebroken.xml | 22 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 tests/invalidwherebroken.xml diff --git a/src/XML/Operator.php b/src/XML/Operator.php index 61f410a..36721c3 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -81,9 +81,9 @@ class Operator implements XmlDeserializable { $operator->arguments[] = $argument['value']; } } else { - if (!$reader->read()) { - break; - } + if (!$reader->read()) { + break; + } } } while ($reader->nodeType !== Reader::END_ELEMENT); diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index 974363b..df6d1eb 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -177,4 +177,17 @@ class QueryParserTest extends TestCase { new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::ASC) ], $search->orderBy); } + + /** + * @expectedException \Sabre\Xml\LibXMLException + * @expectedExceptionMessage Opening and ending tag mismatch: prop line 17 and gt + * on line 19, column 20 + * + * @throws \Sabre\Xml\ParseException + */ + public function testParseWhereBroken() + { + $query = file_get_contents(__DIR__ . '/invalidwherebroken.xml'); + (new QueryParser())->parse($query, null, $rootElementName); + } } diff --git a/tests/invalidwherebroken.xml b/tests/invalidwherebroken.xml new file mode 100644 index 0000000..04025dd --- /dev/null +++ b/tests/invalidwherebroken.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + /container1/ + infinity + + + + + + 5 + + + + From 68d6c966a4fd34869e9863963e8cc5362bbdc0ec Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sat, 9 Nov 2019 10:51:25 +0100 Subject: [PATCH 31/47] Load tests only on dev --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6e7fe46..1c71d39 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,11 @@ }, "autoload": { "psr-4": { - "SearchDAV\\": "src/", + "SearchDAV\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { "SearchDAV\\Test\\": "tests/" } } From 49c010f4d7c32724d564b0558361e3e2677f0909 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 6 Feb 2020 14:26:43 +0100 Subject: [PATCH 32/47] update sabredav and phpunit --- .gitignore | 2 ++ .travis.yml | 2 +- composer.json | 4 ++-- tests/DummyBackend.php | 1 - tests/QueryParserTest.php | 39 +++++++++++++++----------------------- tests/SearchPluginTest.php | 3 +-- tests/bootstrap.php | 2 +- 7 files changed, 22 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 987e2a2..1c769fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ composer.lock vendor +coverage.xml +.phpunit.result.cache diff --git a/.travis.yml b/.travis.yml index 2236f26..58f03a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: php php: - - '7.1' - '7.2' - '7.3' + - '7.4' cache: directories: diff --git a/composer.json b/composer.json index 1c71d39..8988c35 100644 --- a/composer.json +++ b/composer.json @@ -10,10 +10,10 @@ ], "require": { "php": ">=7.1", - "sabre/dav": "^3.2.0" + "sabre/dav": "^4.0.0" }, "require-dev": { - "phpunit/phpunit": "^7" + "phpunit/phpunit": "^8" }, "autoload": { "psr-4": { diff --git a/tests/DummyBackend.php b/tests/DummyBackend.php index f5da86c..a54c79d 100644 --- a/tests/DummyBackend.php +++ b/tests/DummyBackend.php @@ -21,7 +21,6 @@ namespace SearchDAV\Test; - use Sabre\DAV\INode; use Sabre\DAV\SimpleFile; use SearchDAV\Backend\ISearchBackend; diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index df6d1eb..6203541 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -21,8 +21,8 @@ namespace SearchDAV\Test; - use PHPUnit\Framework\TestCase; +use Sabre\Xml\ParseException; use Sabre\Xml\Service; use SearchDAV\DAV\QueryParser; use SearchDAV\XML\BasicSearch; @@ -49,14 +49,14 @@ class QueryParserTest extends TestCase { $this->assertEquals(['{DAV:}getcontentlength'], $search->select); $this->assertEquals([ - new Scope('/container1/', 'infinity') + new Scope('/container1/', 'infinity'), ], $search->from); $this->assertEquals(new Operator(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, [ '{DAV:}getcontentlength', - new Literal(10000) + new Literal(10000), ]), $search->where); $this->assertEquals([ - new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::ASC) + new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::ASC), ], $search->orderBy); } @@ -74,14 +74,14 @@ class QueryParserTest extends TestCase { $this->assertEquals(['{DAV:}getcontentlength'], $search->select); $this->assertEquals([ - new Scope('/container1/', 'infinity') + new Scope('/container1/', 'infinity'), ], $search->from); $this->assertEquals(new Operator(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, [ '{DAV:}getcontentlength', - new Literal(10000) + new Literal(10000), ]), $search->where); $this->assertEquals([ - new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::DESC) + new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::DESC), ], $search->orderBy); } @@ -106,12 +106,10 @@ class QueryParserTest extends TestCase { $this->assertEquals([], $search->orderBy); } - /** - * @expectedException \Sabre\XML\ParseException - */ public function testParseNoFrom() { $query = file_get_contents(__DIR__ . '/nofrom.xml'); $parser = new QueryParser(); + $this->expectException(ParseException::class); $parser->parse($query, null, $rootElementName); } @@ -158,36 +156,29 @@ class QueryParserTest extends TestCase { $this->assertEquals(['{DAV:}getcontentlength'], $search->select); $this->assertEquals([ - new Scope('/container1/', 'infinity') + new Scope('/container1/', 'infinity'), ], $search->from); $this->assertEquals(new Operator(\SearchDAV\Query\Operator::OPERATION_AND, [ new Operator(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, [ '{DAV:}getcontentlength', - new Literal(10000) + new Literal(10000), ]), new Operator(\SearchDAV\Query\Operator::OPERATION_LESS_THAN, [ '{DAV:}getcontentlength', - new Literal(90000) + new Literal(90000), ]), new Operator(\SearchDAV\Query\Operator::OPERATION_CONTAINS, [ - 'Peter Forsberg' + 'Peter Forsberg', ]), ]), $search->where); $this->assertEquals([ - new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::ASC) + new Order('{DAV:}getcontentlength', \SearchDAV\Query\Order::ASC), ], $search->orderBy); } - /** - * @expectedException \Sabre\Xml\LibXMLException - * @expectedExceptionMessage Opening and ending tag mismatch: prop line 17 and gt - * on line 19, column 20 - * - * @throws \Sabre\Xml\ParseException - */ - public function testParseWhereBroken() - { + public function testParseWhereBroken() { $query = file_get_contents(__DIR__ . '/invalidwherebroken.xml'); + $this->expectException(ParseException::class); (new QueryParser())->parse($query, null, $rootElementName); } } diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index b22dff6..53d4d19 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -21,7 +21,6 @@ namespace SearchDAV\Test; - use PHPUnit\Framework\TestCase; use Sabre\DAV\FS\Directory; use Sabre\DAV\INode; @@ -44,7 +43,7 @@ class SearchPluginTest extends TestCase { /** @var ISearchBackend|\PHPUnit_Framework_MockObject_MockObject */ private $searchBackend; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->searchBackend = $this->getMockBuilder(ISearchBackend::class) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 52135e2..d21c14d 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,3 +1,3 @@ Date: Thu, 6 Feb 2020 14:41:14 +0100 Subject: [PATCH 33/47] add github actions ci --- .github/workflows/ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..768c918 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,14 @@ +name: CI + +on: [push] + +jobs: + build-test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - uses: php-actions/composer@v1 + - uses: php-actions/phpunit@v1.0.0 + with: + config: tests/phpunit.xml From 286f1527d472e8bb432ff28870e4b046027141cd Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 6 Feb 2020 14:56:15 +0100 Subject: [PATCH 34/47] scrutinizer config --- .scrutinizer.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .scrutinizer.yml diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000..884d059 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,6 @@ +build: + nodes: + analysis: + tests: + override: + - php-scrutinizer-run From c69806d900c2c9a5954bfabc80178d6eb0d63df4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 6 Feb 2020 14:56:26 +0100 Subject: [PATCH 35/47] fix scrutinizer type warning --- src/DAV/SearchPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 113010b..17d44cc 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -108,7 +108,7 @@ class SearchPlugin extends ServerPlugin { try { $xml = $this->queryParser->parse( - $request->getBody(), + $request->getBodyAsString(), $request->getUrl(), $documentType ); From 9c1e52272c750f0ee543b43e62e1794cd3bfb212 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Fri, 8 Apr 2022 15:57:51 +0200 Subject: [PATCH 36/47] Allow preloading of properties in one go Make it possible to not be affected by a N+1 issue when doing a search Signed-off-by: Carl Schwan --- src/Backend/ISearchBackend.php | 7 +++++++ src/DAV/SearchHandler.php | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/Backend/ISearchBackend.php b/src/Backend/ISearchBackend.php index 21d577b..a4b510e 100644 --- a/src/Backend/ISearchBackend.php +++ b/src/Backend/ISearchBackend.php @@ -21,6 +21,7 @@ namespace SearchDAV\Backend; +use Sabre\DAV\INode; use SearchDAV\Query\Query; interface ISearchBackend { @@ -81,4 +82,10 @@ interface ISearchBackend { * @return SearchResult[] */ public function search(Query $query); + + /** + * @param INode[] $nodes + * @param string[] $requestProperties + */ + public function preloadPropertyFor(array $nodes, array $requestProperties): void; } diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index 85fe43b..a643062 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -22,6 +22,7 @@ namespace SearchDAV\DAV; use Sabre\DAV\Exception\BadRequest; +use Sabre\DAV\INode; use Sabre\DAV\PropFind; use Sabre\DAV\Server; use Sabre\HTTP\ResponseInterface; @@ -170,6 +171,10 @@ class SearchHandler { private function getPropertiesIteratorResults($results, $propertyNames = [], $depth = 0): \Iterator { $propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS; + $this->searchBackend->preloadPropertyFor(array_map(function (SearchResult $result): INode { + return $result->node; + }, $results), $propertyNames); + foreach ($results as $result) { $node = $result->node; $propFind = new PropFind($result->href, (array)$propertyNames, $depth, $propFindType); From c5d79716d0d7a9c60f767ef2648db164a2cb04cb Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Apr 2022 17:04:51 +0200 Subject: [PATCH 37/47] bumb ci versions --- .github/workflows/ci.yml | 15 +++++++++++---- tests/DummyBackend.php | 4 ++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 768c918..6ad7713 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,10 +5,17 @@ on: [push] jobs: build-test: runs-on: ubuntu-latest + strategy: + matrix: + php-versions: ['7.4', '8.0'] steps: - - uses: actions/checkout@v1 - - uses: php-actions/composer@v1 - - uses: php-actions/phpunit@v1.0.0 + - uses: actions/checkout@v2 + - name: Set up php${{ matrix.php-versons }} + uses: shivammathur/setup-php@master with: - config: tests/phpunit.xml + php-version: ${{ matrix.php-versions }} + - name: Install dependencies + run: composer i + - name: PHPUnit + run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml diff --git a/tests/DummyBackend.php b/tests/DummyBackend.php index a54c79d..6ca63c1 100644 --- a/tests/DummyBackend.php +++ b/tests/DummyBackend.php @@ -52,4 +52,8 @@ class DummyBackend implements ISearchBackend { new SearchResult(new SimpleFile('foo.txt', 'foobar', 'text/plain'), '/bar/foo.txt') ]; } + + public function preloadPropertyFor(array $nodes, array $requestProperties): void { + + } } From 1290acf6754ebfe21b0dffc9707e156b8c54a3e7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Apr 2022 17:17:26 +0200 Subject: [PATCH 38/47] lint/psalm --- .github/workflows/lint.yml | 41 +++++++++++++++++++++++++++ .github/workflows/static-analysis.yml | 20 +++++++++++++ .gitignore | 1 + .php_cs.dist | 15 ++++++++++ composer.json | 12 +++++++- psalm.xml | 15 ++++++++++ 6 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/static-analysis.yml create mode 100644 .php_cs.dist create mode 100644 psalm.xml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..75f0f34 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,41 @@ +name: Php Lint +on: [push, pull_request] + +jobs: + php-linters: + runs-on: ubuntu-20.04 + strategy: + matrix: + php-versions: ['7.4', '8.0'] + name: php${{ matrix.php-versions }} lint + steps: + - name: Checkout + uses: actions/checkout@master + - name: Set up php${{ matrix.php-versons }} + uses: shivammathur/setup-php@master + with: + php-version: ${{ matrix.php-versions }} + coverage: none + extensions: inotify + - name: Install dependencies + run: composer i + - name: Lint + run: composer run lint + + php-cs-fixer: + name: php-cs check + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@master + - name: Set up php${{ matrix.php-versions }} + uses: shivammathur/setup-php@master + with: + php-version: 7.4 + tools: composer:v1 + coverage: none + extensions: inotify + - name: Install dependencies + run: composer i + - name: Run coding standards check + run: composer run cs:check diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml new file mode 100644 index 0000000..58c8155 --- /dev/null +++ b/.github/workflows/static-analysis.yml @@ -0,0 +1,20 @@ +name: Php Static analysis +on: [push, pull_request] + +jobs: + static-psalm-analysis: + runs-on: ubuntu-20.04 + steps: + - name: Checkout + uses: actions/checkout@master + - name: Set up php + uses: shivammathur/setup-php@master + with: + php-version: 7.4 + tools: composer:v1 + coverage: none + extensions: redis + - name: Install dependencies + run: composer i + - name: Run coding standards check + run: composer run psalm diff --git a/.gitignore b/.gitignore index 1c769fc..3ca03c7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ composer.lock vendor coverage.xml .phpunit.result.cache +*.cache diff --git a/.php_cs.dist b/.php_cs.dist new file mode 100644 index 0000000..a2fdf19 --- /dev/null +++ b/.php_cs.dist @@ -0,0 +1,15 @@ +exclude('vendor') + ->in(__DIR__) +; +return PhpCsFixer\Config::create() + ->setRules([ + '@PSR2' => true, + 'array_syntax' => ['syntax' => 'short'], + 'braces' => ['position_after_functions_and_oop_constructs' => 'same'], + 'binary_operator_spaces' => ['align_double_arrow' => true, 'align_equals' => false], + ]) + ->setIndent("\t") + ->setFinder($finder) + ; diff --git a/composer.json b/composer.json index 8988c35..1c76777 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,14 @@ } ], "require": { - "php": ">=7.1", + "php": ">=7.3 || >=8.0", "sabre/dav": "^4.0.0" }, "require-dev": { + "php-parallel-lint/php-parallel-lint": "^1.0", + "friendsofphp/php-cs-fixer": "^2", + "phpstan/phpstan": "^0.12", + "psalm/phar": "^4.3", "phpunit/phpunit": "^8" }, "autoload": { @@ -24,5 +28,11 @@ "psr-4": { "SearchDAV\\Test\\": "tests/" } + }, + "scripts": { + "lint": "parallel-lint --exclude src --exclude vendor --exclude target --exclude build .", + "cs:check": "php-cs-fixer fix --dry-run --diff", + "cs:fix": "php-cs-fixer fix", + "psalm": "psalm.phar" } } diff --git a/psalm.xml b/psalm.xml new file mode 100644 index 0000000..30258a7 --- /dev/null +++ b/psalm.xml @@ -0,0 +1,15 @@ + + + + + + + + + From 3d85afde98c4d3df4b62af19fa1d8c4a2558110a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Apr 2022 17:25:10 +0200 Subject: [PATCH 39/47] psalm fixes --- src/DAV/SearchPlugin.php | 10 +++++----- src/Query/Operator.php | 5 +++-- src/Query/Query.php | 2 +- src/XML/BasicSearch.php | 10 +++++----- src/XML/Operator.php | 4 ++-- src/XML/QueryDiscoverResponse.php | 3 +++ 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 17d44cc..7690bb5 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -76,11 +76,11 @@ class SearchPlugin extends ServerPlugin { /** * SEARCH is allowed for users files * - * @param string $uri + * @param string $path * @return array */ - public function getHTTPMethods($uri) { - $path = $this->pathHelper->getPathFromUri($uri); + public function getHTTPMethods($path) { + $path = $this->pathHelper->getPathFromUri($path); if ($this->searchBackend->getArbiterPath() === $path) { return ['SEARCH']; } else { @@ -95,9 +95,9 @@ class SearchPlugin extends ServerPlugin { } public function searchHandler(RequestInterface $request, ResponseInterface $response) { - $contentType = $request->getHeader('Content-Type'); + $contentType = $request->getHeader('Content-Type') ?? ''; - // Currently we only support xml search queries + // Currently, we only support xml search queries if ((strpos($contentType, 'text/xml') === false) && (strpos($contentType, 'application/xml') === false)) { return true; } diff --git a/src/Query/Operator.php b/src/Query/Operator.php index 198d1fb..4390bdd 100644 --- a/src/Query/Operator.php +++ b/src/Query/Operator.php @@ -41,14 +41,15 @@ class Operator { * The type of operation, one of the Operator::OPERATION_* constants */ public $type; + /** - * @var (Literal|SearchPropDefinition|Operation)[] + * @var (Literal|\SearchDAV\Backend\SearchPropertyDefinition|Operator)[] * * The list of arguments for the operation * * - SearchPropDefinition: property for comparison * - Literal: literal value for comparison - * - Operation: nested operation for and/or/not operations + * - Operator: nested operation for and/or/not operations * * Which type and what number of argument an Operator takes depends on the operator type. */ diff --git a/src/Query/Query.php b/src/Query/Query.php index 613c369..c64e8cf 100644 --- a/src/Query/Query.php +++ b/src/Query/Query.php @@ -38,7 +38,7 @@ class Query { */ public $from; /** - * @var Operator + * @var ?Operator * * The search operator, either a comparison ('gt', 'eq', ...) or a boolean operator ('and', 'or', 'not') */ diff --git a/src/XML/BasicSearch.php b/src/XML/BasicSearch.php index 269edb0..7bc3b11 100644 --- a/src/XML/BasicSearch.php +++ b/src/XML/BasicSearch.php @@ -42,7 +42,7 @@ class BasicSearch implements XmlDeserializable { */ public $from; /** - * @var Operator + * @var ?Operator * * The search operator, either a comparison ('gt', 'eq', ...) or a boolean operator ('and', 'or', 'not') */ @@ -79,11 +79,11 @@ class BasicSearch implements XmlDeserializable { throw new ParseException('Missing {DAV:}from when parsing {DAV:}basicsearch'); } - $search->select = isset($elements['{DAV:}select']) ? $elements['{DAV:}select'] : []; + $search->select = $elements['{DAV:}select'] ?? []; $search->from = $elements['{DAV:}from']; - $search->where = isset($elements['{DAV:}where']) ? $elements['{DAV:}where'] : null; - $search->orderBy = isset($elements['{DAV:}orderby']) ? $elements['{DAV:}orderby'] : []; - $search->limit = isset($elements['{DAV:}limit']) ? $elements['{DAV:}limit'] : new Limit(); + $search->where = $elements['{DAV:}where'] ?? null; + $search->orderBy = $elements['{DAV:}orderby'] ?? []; + $search->limit = $elements['{DAV:}limit'] ?? new Limit(); return $search; } diff --git a/src/XML/Operator.php b/src/XML/Operator.php index 36721c3..1d6a176 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -33,7 +33,7 @@ class Operator implements XmlDeserializable { */ public $type; /** - * @var (Literal|string|Operation)[] + * @var (Literal|string|Operator)[] * * The list of arguments for the operation * @@ -59,7 +59,7 @@ class Operator implements XmlDeserializable { static function xmlDeserialize(Reader $reader): Operator { $operator = new self(); - $operator->type = $reader->getClark(); + $operator->type = $reader->getClark() ?? ''; if ($reader->isEmptyElement) { $reader->next(); return $operator; diff --git a/src/XML/QueryDiscoverResponse.php b/src/XML/QueryDiscoverResponse.php index 802fdcd..1f63a61 100644 --- a/src/XML/QueryDiscoverResponse.php +++ b/src/XML/QueryDiscoverResponse.php @@ -39,6 +39,9 @@ class QueryDiscoverResponse extends Response { * @param null|int|string $httpStatus */ function __construct($href, BasicSearchSchema $schema = null, $httpStatus = null) { + if ($httpStatus !== null) { + $httpStatus = (string)$httpStatus; + } parent::__construct($href, [], $httpStatus); $this->schema = $schema; From 4d51484de3fc1f9aa3ca7aef9b5cb57154d00137 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Apr 2022 17:28:32 +0200 Subject: [PATCH 40/47] fmt --- src/Backend/SearchResult.php | 1 - src/DAV/QueryParser.php | 40 +++++++-------- src/DAV/SearchHandler.php | 6 ++- src/Query/Limit.php | 1 - src/Query/Literal.php | 1 - src/Query/Order.php | 1 - src/Query/Query.php | 1 - src/Query/Scope.php | 1 - src/XML/BasicSearch.php | 2 +- src/XML/BasicSearchSchema.php | 7 ++- src/XML/Limit.php | 2 +- src/XML/Literal.php | 3 +- src/XML/Operator.php | 2 +- src/XML/Order.php | 3 +- src/XML/PropDesc.php | 5 +- src/XML/QueryDiscoverResponse.php | 8 ++- src/XML/Scope.php | 2 +- src/XML/SupportedQueryGrammar.php | 3 +- tests/DummyBackend.php | 1 - tests/PathHelperTest.php | 2 +- tests/QueryParserTest.php | 1 - tests/SearchPluginTest.php | 82 ++++++++++++++++++++++++------- 22 files changed, 103 insertions(+), 72 deletions(-) diff --git a/src/Backend/SearchResult.php b/src/Backend/SearchResult.php index 43ee333..97c5eae 100644 --- a/src/Backend/SearchResult.php +++ b/src/Backend/SearchResult.php @@ -21,7 +21,6 @@ namespace SearchDAV\Backend; - use Sabre\DAV\INode; class SearchResult { diff --git a/src/DAV/QueryParser.php b/src/DAV/QueryParser.php index 44c594b..55e5f2d 100644 --- a/src/DAV/QueryParser.php +++ b/src/DAV/QueryParser.php @@ -33,19 +33,19 @@ use SearchDAV\XML\Scope; class QueryParser extends Service { public $namespaceMap = [ - 'DAV:' => 'd', - 'http://sabredav.org/ns' => 's', + 'DAV:' => 'd', + 'http://sabredav.org/ns' => 's', 'http://www.w3.org/2001/XMLSchema' => 'xs', - SearchPlugin::SEARCHDAV_NS => 'sd' + SearchPlugin::SEARCHDAV_NS => 'sd' ]; public function __construct() { $this->elementMap = [ - '{DAV:}literal' => Literal::class, - '{DAV:}searchrequest' => Element\KeyValue::class, + '{DAV:}literal' => Literal::class, + '{DAV:}searchrequest' => Element\KeyValue::class, '{DAV:}query-schema-discovery' => Element\KeyValue::class, - '{DAV:}basicsearch' => BasicSearch::class, - '{DAV:}select' => function (Reader $reader) { + '{DAV:}basicsearch' => BasicSearch::class, + '{DAV:}select' => function (Reader $reader) { return \Sabre\Xml\Deserializer\keyValue($reader, '{DAV:}scope')['{DAV:}prop']; }, '{DAV:}from' => function (Reader $reader) { @@ -61,20 +61,20 @@ class QueryParser extends Service { }, $reader->parseGetElements()); return (isset($operators[0])) ? $operators[0] : null; }, - '{DAV:}prop' => Element\Elements::class, - '{DAV:}order' => Order::class, - '{DAV:}eq' => Operator::class, - '{DAV:}gt' => Operator::class, - '{DAV:}gte' => Operator::class, - '{DAV:}lt' => Operator::class, - '{DAV:}lte' => Operator::class, - '{DAV:}and' => Operator::class, - '{DAV:}or' => Operator::class, - '{DAV:}like' => Operator::class, - '{DAV:}contains' => Operator::class, - '{DAV:}not' => Operator::class, + '{DAV:}prop' => Element\Elements::class, + '{DAV:}order' => Order::class, + '{DAV:}eq' => Operator::class, + '{DAV:}gt' => Operator::class, + '{DAV:}gte' => Operator::class, + '{DAV:}lt' => Operator::class, + '{DAV:}lte' => Operator::class, + '{DAV:}and' => Operator::class, + '{DAV:}or' => Operator::class, + '{DAV:}like' => Operator::class, + '{DAV:}contains' => Operator::class, + '{DAV:}not' => Operator::class, '{DAV:}is-collection' => Operator::class, - '{DAV:}limit' => Limit::class, + '{DAV:}limit' => Limit::class, ]; } } diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index a643062..3d20cbf 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -85,8 +85,10 @@ class SearchHandler { $response->setBody($e->getMessage()); return false; } - $data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults($results, - $query->select)), false); + $data = $this->server->generateMultiStatus(iterator_to_array($this->getPropertiesIteratorResults( + $results, + $query->select + )), false); $response->setBody($data); return false; } diff --git a/src/Query/Limit.php b/src/Query/Limit.php index e6b4867..f59550f 100644 --- a/src/Query/Limit.php +++ b/src/Query/Limit.php @@ -21,7 +21,6 @@ namespace SearchDAV\Query; - class Limit { /** * @var integer diff --git a/src/Query/Literal.php b/src/Query/Literal.php index 862a412..99ce07a 100644 --- a/src/Query/Literal.php +++ b/src/Query/Literal.php @@ -21,7 +21,6 @@ namespace SearchDAV\Query; - class Literal { /** * @var string|boolean|\DateTime|integer diff --git a/src/Query/Order.php b/src/Query/Order.php index c6afcee..20f69f6 100644 --- a/src/Query/Order.php +++ b/src/Query/Order.php @@ -21,7 +21,6 @@ namespace SearchDAV\Query; - use SearchDAV\Backend\SearchPropertyDefinition; class Order { diff --git a/src/Query/Query.php b/src/Query/Query.php index c64e8cf..107b0d3 100644 --- a/src/Query/Query.php +++ b/src/Query/Query.php @@ -21,7 +21,6 @@ namespace SearchDAV\Query; - use SearchDAV\Backend\SearchPropertyDefinition; class Query { diff --git a/src/Query/Scope.php b/src/Query/Scope.php index 9c342c8..faded1c 100644 --- a/src/Query/Scope.php +++ b/src/Query/Scope.php @@ -21,7 +21,6 @@ namespace SearchDAV\Query; - class Scope { /** * @var string diff --git a/src/XML/BasicSearch.php b/src/XML/BasicSearch.php index 7bc3b11..0227927 100644 --- a/src/XML/BasicSearch.php +++ b/src/XML/BasicSearch.php @@ -70,7 +70,7 @@ class BasicSearch implements XmlDeserializable { * @return BasicSearch * @throws ParseException */ - static function xmlDeserialize(Reader $reader): BasicSearch { + public static function xmlDeserialize(Reader $reader): BasicSearch { $search = new self(); $elements = \Sabre\Xml\Deserializer\keyValue($reader); diff --git a/src/XML/BasicSearchSchema.php b/src/XML/BasicSearchSchema.php index edda372..d2616c4 100644 --- a/src/XML/BasicSearchSchema.php +++ b/src/XML/BasicSearchSchema.php @@ -21,7 +21,6 @@ namespace SearchDAV\XML; - use Sabre\Xml\Writer; use Sabre\Xml\XmlSerializable; @@ -38,10 +37,10 @@ class BasicSearchSchema implements XmlSerializable { $this->properties = $properties; } - function xmlSerialize(Writer $writer) { - $childs = array_map(function(PropDesc $propDesc) { + public function xmlSerialize(Writer $writer) { + $childs = array_map(function (PropDesc $propDesc) { return [ - 'name' => '{DAV:}propdesc', + 'name' => '{DAV:}propdesc', 'value' => $propDesc ]; }, $this->properties); diff --git a/src/XML/Limit.php b/src/XML/Limit.php index 26d7866..71e356c 100644 --- a/src/XML/Limit.php +++ b/src/XML/Limit.php @@ -29,7 +29,7 @@ use SearchDAV\DAV\SearchPlugin; * The limit and offset of a search query */ class Limit extends \SearchDAV\Query\Limit implements XmlDeserializable { - static function xmlDeserialize(Reader $reader): Limit { + public static function xmlDeserialize(Reader $reader): Limit { $limit = new self(); $elements = \Sabre\Xml\Deserializer\keyValue($reader); diff --git a/src/XML/Literal.php b/src/XML/Literal.php index 92c76ca..dc1f69d 100644 --- a/src/XML/Literal.php +++ b/src/XML/Literal.php @@ -21,12 +21,11 @@ namespace SearchDAV\XML; - use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; class Literal extends \SearchDAV\Query\Literal implements XmlDeserializable { - static function xmlDeserialize(Reader $reader): Literal { + public static function xmlDeserialize(Reader $reader): Literal { $literal = new self(); if ($reader->isEmptyElement) { diff --git a/src/XML/Operator.php b/src/XML/Operator.php index 1d6a176..f7a714c 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -56,7 +56,7 @@ class Operator implements XmlDeserializable { $this->arguments = $arguments; } - static function xmlDeserialize(Reader $reader): Operator { + public static function xmlDeserialize(Reader $reader): Operator { $operator = new self(); $operator->type = $reader->getClark() ?? ''; diff --git a/src/XML/Order.php b/src/XML/Order.php index 7aae162..e675f78 100644 --- a/src/XML/Order.php +++ b/src/XML/Order.php @@ -21,7 +21,6 @@ namespace SearchDAV\XML; - use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; @@ -50,7 +49,7 @@ class Order implements XmlDeserializable { $this->order = $order; } - static function xmlDeserialize(Reader $reader): Order { + public static function xmlDeserialize(Reader $reader): Order { $order = new self(); $childs = \Sabre\Xml\Deserializer\keyValue($reader); diff --git a/src/XML/PropDesc.php b/src/XML/PropDesc.php index ab503b3..0cfc848 100644 --- a/src/XML/PropDesc.php +++ b/src/XML/PropDesc.php @@ -21,7 +21,6 @@ namespace SearchDAV\XML; - use Sabre\Xml\Writer; use Sabre\Xml\XmlSerializable; @@ -47,7 +46,7 @@ class PropDesc implements XmlSerializable { */ public $sortable; - function xmlSerialize(Writer $writer) { + public function xmlSerialize(Writer $writer) { $data = [ '{DAV:}dataType' => [$this->dataType => null] ]; @@ -62,7 +61,7 @@ class PropDesc implements XmlSerializable { } $writer->write(array_map(function ($propName) { return [ - 'name' => '{DAV:}prop', + 'name' => '{DAV:}prop', 'value' => $propName ]; }, $this->properties)); diff --git a/src/XML/QueryDiscoverResponse.php b/src/XML/QueryDiscoverResponse.php index 1f63a61..d9af76c 100644 --- a/src/XML/QueryDiscoverResponse.php +++ b/src/XML/QueryDiscoverResponse.php @@ -21,7 +21,6 @@ namespace SearchDAV\XML; - use Sabre\DAV\Xml\Element\Response; use Sabre\Xml\Writer; @@ -38,16 +37,15 @@ class QueryDiscoverResponse extends Response { * @param BasicSearchSchema|null $schema * @param null|int|string $httpStatus */ - function __construct($href, BasicSearchSchema $schema = null, $httpStatus = null) { + public function __construct($href, BasicSearchSchema $schema = null, $httpStatus = null) { if ($httpStatus !== null) { $httpStatus = (string)$httpStatus; } parent::__construct($href, [], $httpStatus); $this->schema = $schema; - } - function xmlSerialize(Writer $writer) { + public function xmlSerialize(Writer $writer) { if ($status = $this->getHTTPStatus()) { $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]); } @@ -55,7 +53,7 @@ class QueryDiscoverResponse extends Response { if ($this->schema) { $writer->writeElement('{DAV:}query-schema', [ - '{DAV:}basicsearchschema' => $this->schema + '{DAV:}basicsearchschema' => $this->schema ]); } } diff --git a/src/XML/Scope.php b/src/XML/Scope.php index 78d4ba4..6fb7c0f 100644 --- a/src/XML/Scope.php +++ b/src/XML/Scope.php @@ -25,7 +25,7 @@ use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; class Scope extends \SearchDAV\Query\Scope implements XmlDeserializable { - static function xmlDeserialize(Reader $reader): Scope { + public static function xmlDeserialize(Reader $reader): Scope { $scope = new self(); $values = \Sabre\Xml\Deserializer\keyValue($reader); diff --git a/src/XML/SupportedQueryGrammar.php b/src/XML/SupportedQueryGrammar.php index ddb4e33..12e84e5 100644 --- a/src/XML/SupportedQueryGrammar.php +++ b/src/XML/SupportedQueryGrammar.php @@ -21,7 +21,6 @@ namespace SearchDAV\XML; - use Sabre\Xml\Writer; use Sabre\Xml\XmlSerializable; @@ -30,7 +29,7 @@ class SupportedQueryGrammar implements XmlSerializable { public $grammar = self::GRAMMAR_BASICSEARCH; - function xmlSerialize(Writer $writer) { + public function xmlSerialize(Writer $writer) { $writer->startElement('{DAV:}supported-query-grammar'); $writer->startElement('{DAV:}grammar'); $writer->startElement($this->grammar); diff --git a/tests/DummyBackend.php b/tests/DummyBackend.php index 6ca63c1..4f0b9ef 100644 --- a/tests/DummyBackend.php +++ b/tests/DummyBackend.php @@ -54,6 +54,5 @@ class DummyBackend implements ISearchBackend { } public function preloadPropertyFor(array $nodes, array $requestProperties): void { - } } diff --git a/tests/PathHelperTest.php b/tests/PathHelperTest.php index d0b27a1..1a83a6a 100644 --- a/tests/PathHelperTest.php +++ b/tests/PathHelperTest.php @@ -26,7 +26,7 @@ use Sabre\DAV\Server; use SearchDAV\DAV\PathHelper; class PathHelperTest extends TestCase { - public function uriProvider(){ + public function uriProvider() { return [ ['/', '', ''], ['/index.php/', 'foo', 'foo'], diff --git a/tests/QueryParserTest.php b/tests/QueryParserTest.php index 6203541..84e6b8c 100644 --- a/tests/QueryParserTest.php +++ b/tests/QueryParserTest.php @@ -33,7 +33,6 @@ use SearchDAV\XML\Order; use SearchDAV\XML\Scope; use SearchDAV\XML\SupportedQueryGrammar; - class QueryParserTest extends TestCase { public function testParseBasicQuery() { $query = file_get_contents(__DIR__ . '/basicquery.xml'); diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index 53d4d19..d97e91e 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -180,12 +180,22 @@ class SearchPluginTest extends TestCase { $this->searchBackend->expects($this->once()) ->method('getPropertyDefinitionsForScope') ->willReturn([ - new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition( + '{DAV:}getcontentlength', + true, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ), new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new SearchPropertyDefinition('{DAV:}displayname', true, true, true), - new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition( + '{http://ns.nextcloud.com:}fileid', + false, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ), ]); $plugin->searchHandler($request, $response); @@ -274,8 +284,13 @@ class SearchPluginTest extends TestCase { ->method('isValidScope') ->willReturn(true); - $lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER); + $lengthProp = new SearchPropertyDefinition( + '{DAV:}getcontentlength', + true, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ); $orderBy = [ new \SearchDAV\Query\Order($lengthProp, \SearchDAV\Query\Order::ASC), ]; @@ -347,8 +362,13 @@ class SearchPluginTest extends TestCase { ->method('getArbiterPath') ->willReturn('foo'); - $lengthProp = new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER); + $lengthProp = new SearchPropertyDefinition( + '{DAV:}getcontentlength', + true, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ); $plugin = new SearchPlugin($this->searchBackend); $server = new Server(); $plugin->initialize($server); @@ -483,8 +503,13 @@ class SearchPluginTest extends TestCase { $this->searchBackend->expects($this->once()) ->method('getPropertyDefinitionsForScope') ->willReturn([ - new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition( + '{http://ns.nextcloud.com:}fileid', + false, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ), ]); $plugin->searchHandler($request, $response); @@ -518,10 +543,20 @@ class SearchPluginTest extends TestCase { $this->searchBackend->expects($this->any()) ->method('getPropertyDefinitionsForScope') ->willReturn([ - new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), - new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition( + '{http://ns.nextcloud.com:}fileid', + false, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ), + new SearchPropertyDefinition( + '{DAV:}getcontentlength', + true, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ), ]); $plugin->searchHandler($request, $response); @@ -555,15 +590,24 @@ class SearchPluginTest extends TestCase { $this->searchBackend->expects($this->any()) ->method('getPropertyDefinitionsForScope') ->willReturn([ - new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), - new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition( + '{http://ns.nextcloud.com:}fileid', + false, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ), + new SearchPropertyDefinition( + '{DAV:}getcontentlength', + true, + true, + true, + SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + ), ]); $plugin->searchHandler($request, $response); $this->assertEquals(400, $response->getStatus()); } - } From b47321646b161a8392dbe790f9101f95cf5f5afb Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Apr 2022 17:29:52 +0200 Subject: [PATCH 41/47] add phpstan in ci --- .github/workflows/static-analysis.yml | 18 +++++++++++++++++- composer.json | 3 ++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 58c8155..b286401 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -2,7 +2,7 @@ name: Php Static analysis on: [push, pull_request] jobs: - static-psalm-analysis: + psalm: runs-on: ubuntu-20.04 steps: - name: Checkout @@ -18,3 +18,19 @@ jobs: run: composer i - name: Run coding standards check run: composer run psalm + phpstan: + runs-on: ubuntu-20.04 + steps: + - name: Checkout + uses: actions/checkout@master + - name: Set up php + uses: shivammathur/setup-php@master + with: + php-version: 7.4 + tools: composer:v1 + coverage: none + extensions: redis + - name: Install dependencies + run: composer i + - name: Run coding standards check + run: composer run psalm diff --git a/composer.json b/composer.json index 1c76777..25e7143 100644 --- a/composer.json +++ b/composer.json @@ -33,6 +33,7 @@ "lint": "parallel-lint --exclude src --exclude vendor --exclude target --exclude build .", "cs:check": "php-cs-fixer fix --dry-run --diff", "cs:fix": "php-cs-fixer fix", - "psalm": "psalm.phar" + "psalm": "psalm.phar", + "phpstan": "phpstan analyse --level 5 src" } } From 721b8825d83034c421067046450481347ae142e6 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Apr 2022 17:33:30 +0200 Subject: [PATCH 42/47] comment --- src/Backend/ISearchBackend.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Backend/ISearchBackend.php b/src/Backend/ISearchBackend.php index a4b510e..11ffdb7 100644 --- a/src/Backend/ISearchBackend.php +++ b/src/Backend/ISearchBackend.php @@ -84,6 +84,9 @@ interface ISearchBackend { public function search(Query $query); /** + * Called by the search plugin once the nodes to be returned have been found. + * This can be used to more efficiently load the requested properties for the results. + * * @param INode[] $nodes * @param string[] $requestProperties */ From d3eb42cd90ed7be9c8f9b2cb1ca017449080600a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Apr 2022 17:36:08 +0200 Subject: [PATCH 43/47] more types --- src/Backend/ISearchBackend.php | 8 ++++---- src/Backend/SearchPropertyDefinition.php | 2 +- src/Backend/SearchResult.php | 2 +- src/DAV/DiscoverHandler.php | 2 +- src/DAV/PathHelper.php | 2 +- src/DAV/SearchHandler.php | 12 ++++++------ src/DAV/SearchPlugin.php | 12 ++++++------ src/Query/Operator.php | 2 +- src/XML/BasicSearchSchema.php | 2 +- src/XML/Operator.php | 2 +- src/XML/PropDesc.php | 2 +- src/XML/QueryDiscoverResponse.php | 2 +- src/XML/SupportedQueryGrammar.php | 8 +++----- tests/DummyBackend.php | 8 ++++---- 14 files changed, 32 insertions(+), 34 deletions(-) diff --git a/src/Backend/ISearchBackend.php b/src/Backend/ISearchBackend.php index 11ffdb7..6a1defc 100644 --- a/src/Backend/ISearchBackend.php +++ b/src/Backend/ISearchBackend.php @@ -38,7 +38,7 @@ interface ISearchBackend { * * @return string */ - public function getArbiterPath(); + public function getArbiterPath(): string; /** * Whether or not the search backend supports search requests on this scope @@ -55,7 +55,7 @@ interface ISearchBackend { * @param string|null $path the path of the search scope relative to the dav server, or null if the scope is outside the dav server * @return bool */ - public function isValidScope($href, $depth, $path); + public function isValidScope(string $href, $depth, ?string $path): bool; /** * List the available properties that can be used in search @@ -69,7 +69,7 @@ interface ISearchBackend { * @param string|null $path the path of the search scope relative to the dav server, or null if the scope is outside the dav server * @return SearchPropertyDefinition[] */ - public function getPropertyDefinitionsForScope($href, $path); + public function getPropertyDefinitionsForScope(string $href, ?string $path): array; /** * Preform the search request @@ -81,7 +81,7 @@ interface ISearchBackend { * @param Query $query * @return SearchResult[] */ - public function search(Query $query); + public function search(Query $query): array; /** * Called by the search plugin once the nodes to be returned have been found. diff --git a/src/Backend/SearchPropertyDefinition.php b/src/Backend/SearchPropertyDefinition.php index daa22bd..f4a7f3e 100644 --- a/src/Backend/SearchPropertyDefinition.php +++ b/src/Backend/SearchPropertyDefinition.php @@ -54,7 +54,7 @@ class SearchPropertyDefinition { * @param string $dataType the datatype of the property, one of the SearchProperty::DATATYPE_ constants or any XSD datatype in clark notation * @param bool $caseSensitive whether or not comparisons on the property are case sensitive, only applies to string propertries */ - public function __construct($name, $searchable, $selectable, $sortable, $dataType = self::DATATYPE_STRING, $caseSensitive = true) { + public function __construct(string $name, bool $selectable, bool $searchable, bool $sortable, string $dataType = self::DATATYPE_STRING, bool $caseSensitive = true) { $this->searchable = $searchable; $this->selectable = $selectable; $this->sortable = $sortable; diff --git a/src/Backend/SearchResult.php b/src/Backend/SearchResult.php index 97c5eae..af48506 100644 --- a/src/Backend/SearchResult.php +++ b/src/Backend/SearchResult.php @@ -35,7 +35,7 @@ class SearchResult { * @param INode $node * @param string $href */ - public function __construct(INode $node, $href) { + public function __construct(INode $node, string $href) { $this->node = $node; $this->href = $href; } diff --git a/src/DAV/DiscoverHandler.php b/src/DAV/DiscoverHandler.php index e5a48a1..84cc571 100644 --- a/src/DAV/DiscoverHandler.php +++ b/src/DAV/DiscoverHandler.php @@ -54,7 +54,7 @@ class DiscoverHandler { $this->queryParser = $queryParser; } - public function handelDiscoverRequest($xml, RequestInterface $request, ResponseInterface $response) { + public function handelDiscoverRequest($xml, RequestInterface $request, ResponseInterface $response): bool { if (!isset($xml['{DAV:}basicsearch'])) { $response->setStatus(400); $response->setBody('Unexpected xml content for query-schema-discovery, expected basicsearch'); diff --git a/src/DAV/PathHelper.php b/src/DAV/PathHelper.php index 2c0faef..04098c7 100644 --- a/src/DAV/PathHelper.php +++ b/src/DAV/PathHelper.php @@ -37,7 +37,7 @@ class PathHelper { $this->server = $server; } - public function getPathFromUri($uri): ?string { + public function getPathFromUri(string $uri): ?string { if (strpos($uri, '://') === false) { return $uri; } diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index 3d20cbf..27e4da2 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -55,7 +55,7 @@ class SearchHandler { $this->server = $server; } - public function handleSearchRequest($xml, ResponseInterface $response) { + public function handleSearchRequest($xml, ResponseInterface $response): bool { if (!isset($xml['{DAV:}basicsearch'])) { $response->setStatus(400); $response->setBody('Unexpected xml content for searchrequest, expected basicsearch'); @@ -129,7 +129,7 @@ class SearchHandler { /** * @param \SearchDAV\XML\Operator $operator - * @param array $allProps + * @param SearchPropertyDefinition[] $allProps * @return Operator * @throws BadRequest */ @@ -166,11 +166,11 @@ class SearchHandler { * If a depth of 1 is requested child elements will also be returned. * * @param SearchResult[] $results - * @param array $propertyNames + * @param string[] $propertyNames * @param int $depth - * @return \Iterator + * @return \Iterator */ - private function getPropertiesIteratorResults($results, $propertyNames = [], $depth = 0): \Iterator { + private function getPropertiesIteratorResults(array $results, array $propertyNames = [], int $depth = 0): \Iterator { $propFindType = $propertyNames ? PropFind::NORMAL : PropFind::ALLPROPS; $this->searchBackend->preloadPropertyFor(array_map(function (SearchResult $result): INode { @@ -179,7 +179,7 @@ class SearchHandler { foreach ($results as $result) { $node = $result->node; - $propFind = new PropFind($result->href, (array)$propertyNames, $depth, $propFindType); + $propFind = new PropFind($result->href, $propertyNames, $depth, $propFindType); $r = $this->server->getPropertiesByNode($propFind, $node); if ($r) { $result = $propFind->getResultForMultiStatus(); diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 7690bb5..2a5b823 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -57,7 +57,7 @@ class SearchPlugin extends ServerPlugin { $this->queryParser = new QueryParser(); } - public function initialize(Server $server) { + public function initialize(Server $server): void { $this->server = $server; $this->pathHelper = new PathHelper($server); $this->search = new SearchHandler($this->searchBackend, $this->pathHelper, $server); @@ -67,7 +67,7 @@ class SearchPlugin extends ServerPlugin { $server->on('propFind', [$this, 'propFindHandler']); } - public function propFindHandler(PropFind $propFind, INode $node) { + public function propFindHandler(PropFind $propFind, INode $node): void { if ($propFind->getPath() === $this->searchBackend->getArbiterPath()) { $propFind->handle('{DAV:}supported-query-grammar-set', new SupportedQueryGrammar()); } @@ -77,9 +77,9 @@ class SearchPlugin extends ServerPlugin { * SEARCH is allowed for users files * * @param string $path - * @return array + * @return string[] */ - public function getHTTPMethods($path) { + public function getHTTPMethods($path): array { $path = $this->pathHelper->getPathFromUri($path); if ($this->searchBackend->getArbiterPath() === $path) { return ['SEARCH']; @@ -88,13 +88,13 @@ class SearchPlugin extends ServerPlugin { } } - public function optionHandler(RequestInterface $request, ResponseInterface $response) { + public function optionHandler(RequestInterface $request, ResponseInterface $response): void { if ($request->getPath() === $this->searchBackend->getArbiterPath()) { $response->addHeader('DASL', ''); } } - public function searchHandler(RequestInterface $request, ResponseInterface $response) { + public function searchHandler(RequestInterface $request, ResponseInterface $response): bool { $contentType = $request->getHeader('Content-Type') ?? ''; // Currently, we only support xml search queries diff --git a/src/Query/Operator.php b/src/Query/Operator.php index 4390bdd..182f264 100644 --- a/src/Query/Operator.php +++ b/src/Query/Operator.php @@ -59,7 +59,7 @@ class Operator { * Operator constructor. * * @param string $type - * @param array $arguments + * @param (Literal|\SearchDAV\Backend\SearchPropertyDefinition|Operator)[] $arguments */ public function __construct(string $type = '', array $arguments = []) { $this->type = $type; diff --git a/src/XML/BasicSearchSchema.php b/src/XML/BasicSearchSchema.php index d2616c4..c68aabe 100644 --- a/src/XML/BasicSearchSchema.php +++ b/src/XML/BasicSearchSchema.php @@ -37,7 +37,7 @@ class BasicSearchSchema implements XmlSerializable { $this->properties = $properties; } - public function xmlSerialize(Writer $writer) { + public function xmlSerialize(Writer $writer): void { $childs = array_map(function (PropDesc $propDesc) { return [ 'name' => '{DAV:}propdesc', diff --git a/src/XML/Operator.php b/src/XML/Operator.php index f7a714c..fb44ba8 100644 --- a/src/XML/Operator.php +++ b/src/XML/Operator.php @@ -49,7 +49,7 @@ class Operator implements XmlDeserializable { * Operator constructor. * * @param string $type - * @param array $arguments + * @param (Literal|string|Operator)[] $arguments */ public function __construct(string $type = '', array $arguments = []) { $this->type = $type; diff --git a/src/XML/PropDesc.php b/src/XML/PropDesc.php index 0cfc848..b9549cd 100644 --- a/src/XML/PropDesc.php +++ b/src/XML/PropDesc.php @@ -46,7 +46,7 @@ class PropDesc implements XmlSerializable { */ public $sortable; - public function xmlSerialize(Writer $writer) { + public function xmlSerialize(Writer $writer): void { $data = [ '{DAV:}dataType' => [$this->dataType => null] ]; diff --git a/src/XML/QueryDiscoverResponse.php b/src/XML/QueryDiscoverResponse.php index d9af76c..c1eea4d 100644 --- a/src/XML/QueryDiscoverResponse.php +++ b/src/XML/QueryDiscoverResponse.php @@ -45,7 +45,7 @@ class QueryDiscoverResponse extends Response { $this->schema = $schema; } - public function xmlSerialize(Writer $writer) { + public function xmlSerialize(Writer $writer): void { if ($status = $this->getHTTPStatus()) { $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]); } diff --git a/src/XML/SupportedQueryGrammar.php b/src/XML/SupportedQueryGrammar.php index 12e84e5..a24e7b1 100644 --- a/src/XML/SupportedQueryGrammar.php +++ b/src/XML/SupportedQueryGrammar.php @@ -25,14 +25,12 @@ use Sabre\Xml\Writer; use Sabre\Xml\XmlSerializable; class SupportedQueryGrammar implements XmlSerializable { - const GRAMMAR_BASICSEARCH = '{DAV:}basicsearch'; + const GRAMMAR_BASIC_SEARCH = '{DAV:}basicsearch'; - public $grammar = self::GRAMMAR_BASICSEARCH; - - public function xmlSerialize(Writer $writer) { + public function xmlSerialize(Writer $writer): void { $writer->startElement('{DAV:}supported-query-grammar'); $writer->startElement('{DAV:}grammar'); - $writer->startElement($this->grammar); + $writer->startElement(self::GRAMMAR_BASIC_SEARCH); $writer->endElement(); $writer->endElement(); $writer->endElement(); diff --git a/tests/DummyBackend.php b/tests/DummyBackend.php index 4f0b9ef..a404416 100644 --- a/tests/DummyBackend.php +++ b/tests/DummyBackend.php @@ -30,15 +30,15 @@ use SearchDAV\XML\BasicSearch; use SearchDAV\Backend\SearchPropertyDefinition; class DummyBackend implements ISearchBackend { - public function getArbiterPath() { + public function getArbiterPath(): string { return ''; } - public function isValidScope($href, $depth, $path) { + public function isValidScope(string $href, $depth, ?string $path): bool { return true; } - public function getPropertyDefinitionsForScope($href, $path) { + public function getPropertyDefinitionsForScope($href, $path): array { return [ new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), @@ -47,7 +47,7 @@ class DummyBackend implements ISearchBackend { ]; } - public function search(Query $query) { + public function search(Query $query): array { return [ new SearchResult(new SimpleFile('foo.txt', 'foobar', 'text/plain'), '/bar/foo.txt') ]; From acb32ab84d0ecee6f6137126b98fdda5da5e3b5d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 11 Apr 2022 14:52:12 +0200 Subject: [PATCH 44/47] minor fixes --- src/Backend/ISearchBackend.php | 4 ++-- src/Backend/SearchPropertyDefinition.php | 10 ++++----- src/DAV/DiscoverHandler.php | 7 +----- src/DAV/QueryParser.php | 8 ++++--- src/DAV/SearchHandler.php | 2 +- src/DAV/SearchPlugin.php | 4 ---- src/Query/Query.php | 2 +- src/XML/BasicSearch.php | 28 +++++++++++++++--------- src/XML/Limit.php | 3 ++- src/XML/Order.php | 3 ++- src/XML/PropDesc.php | 8 +++++++ src/XML/QueryDiscoverResponse.php | 3 ++- src/XML/Scope.php | 3 ++- tests/DummyBackend.php | 4 ++-- tests/SearchPluginTest.php | 18 +++++++-------- 15 files changed, 60 insertions(+), 47 deletions(-) diff --git a/src/Backend/ISearchBackend.php b/src/Backend/ISearchBackend.php index 6a1defc..277f284 100644 --- a/src/Backend/ISearchBackend.php +++ b/src/Backend/ISearchBackend.php @@ -28,7 +28,7 @@ interface ISearchBackend { /** * Get the path of the search arbiter of this backend * - * The search arbiter is the URI that the client will send it's SEARCH requests to + * The search arbiter is the URI that the client will send its SEARCH requests to * Note that this is not required to be the same as the search scopes which determine what to search in * * The returned value should be a path relative the root of the dav server. @@ -41,7 +41,7 @@ interface ISearchBackend { public function getArbiterPath(): string; /** - * Whether or not the search backend supports search requests on this scope + * Whether the search backend supports search requests on this scope * * The scope defines the resource that it being searched, such as a folder or address book. * diff --git a/src/Backend/SearchPropertyDefinition.php b/src/Backend/SearchPropertyDefinition.php index f4a7f3e..c8a8879 100644 --- a/src/Backend/SearchPropertyDefinition.php +++ b/src/Backend/SearchPropertyDefinition.php @@ -25,7 +25,7 @@ class SearchPropertyDefinition { const XS = '{http://www.w3.org/2001/XMLSchema}'; const DATATYPE_STRING = self::XS . 'string'; const DATATYPE_INTEGER = self::XS . 'integer'; - const DATATYPE_NONNEGATIVE_INTEGER = self::XS . 'nonNegativeInteger'; + const DATATYPE_NON_NEGATIVE_INTEGER = self::XS . 'nonNegativeInteger'; const DATATYPE_DECIMAL = self::XS . 'decimal'; const DATATYPE_DATETIME = self::XS . 'dateTime'; const DATATYPE_BOOLEAN = self::XS . 'boolean'; @@ -48,11 +48,11 @@ class SearchPropertyDefinition { * SearchProperty constructor. * * @param string $name the name and namespace of the property in clark notation - * @param bool $searchable whether or not this property can be used as part of a search query - * @param bool $selectable whether or not this property can be returned as part of a search result - * @param bool $sortable whether or not this property can be used to sort the search result + * @param bool $searchable whether this property can be used as part of a search query + * @param bool $selectable whether this property can be returned as part of a search result + * @param bool $sortable whether this property can be used to sort the search result * @param string $dataType the datatype of the property, one of the SearchProperty::DATATYPE_ constants or any XSD datatype in clark notation - * @param bool $caseSensitive whether or not comparisons on the property are case sensitive, only applies to string propertries + * @param bool $caseSensitive whether comparisons on the property are case-sensitive, only applies to string properties */ public function __construct(string $name, bool $selectable, bool $searchable, bool $sortable, string $dataType = self::DATATYPE_STRING, bool $caseSensitive = true) { $this->searchable = $searchable; diff --git a/src/DAV/DiscoverHandler.php b/src/DAV/DiscoverHandler.php index 84cc571..811cfc7 100644 --- a/src/DAV/DiscoverHandler.php +++ b/src/DAV/DiscoverHandler.php @@ -97,12 +97,7 @@ class DiscoverHandler { foreach ($propertyDefinitions as $propertyDefinition) { $key = $this->hashDefinition($propertyDefinition); if (!isset($groups[$key])) { - $desc = new PropDesc(); - $desc->dataType = $propertyDefinition->dataType; - $desc->sortable = $propertyDefinition->sortable; - $desc->selectable = $propertyDefinition->selectable; - $desc->searchable = $propertyDefinition->searchable; - $groups[$key] = $desc; + $groups[$key] = new PropDesc($propertyDefinition); } $groups[$key]->properties[] = $propertyDefinition->name; } diff --git a/src/DAV/QueryParser.php b/src/DAV/QueryParser.php index 55e5f2d..440b644 100644 --- a/src/DAV/QueryParser.php +++ b/src/DAV/QueryParser.php @@ -30,6 +30,8 @@ use SearchDAV\XML\Literal; use SearchDAV\XML\Operator; use SearchDAV\XML\Order; use SearchDAV\XML\Scope; +use function Sabre\Xml\Deserializer\keyValue; +use function Sabre\Xml\Deserializer\repeatingElements; class QueryParser extends Service { public $namespaceMap = [ @@ -46,13 +48,13 @@ class QueryParser extends Service { '{DAV:}query-schema-discovery' => Element\KeyValue::class, '{DAV:}basicsearch' => BasicSearch::class, '{DAV:}select' => function (Reader $reader) { - return \Sabre\Xml\Deserializer\keyValue($reader, '{DAV:}scope')['{DAV:}prop']; + return keyValue($reader, '{DAV:}scope')['{DAV:}prop']; }, '{DAV:}from' => function (Reader $reader) { - return \Sabre\Xml\Deserializer\repeatingElements($reader, '{DAV:}scope'); + return repeatingElements($reader, '{DAV:}scope'); }, '{DAV:}orderby' => function (Reader $reader) { - return \Sabre\Xml\Deserializer\repeatingElements($reader, '{DAV:}order'); + return repeatingElements($reader, '{DAV:}order'); }, '{DAV:}scope' => Scope::class, '{DAV:}where' => function (Reader $reader) { diff --git a/src/DAV/SearchHandler.php b/src/DAV/SearchHandler.php index 27e4da2..a1fa5a7 100644 --- a/src/DAV/SearchHandler.php +++ b/src/DAV/SearchHandler.php @@ -58,7 +58,7 @@ class SearchHandler { public function handleSearchRequest($xml, ResponseInterface $response): bool { if (!isset($xml['{DAV:}basicsearch'])) { $response->setStatus(400); - $response->setBody('Unexpected xml content for searchrequest, expected basicsearch'); + $response->setBody('Unexpected xml content for search request, expected basicsearch'); return false; } /** @var BasicSearch $query */ diff --git a/src/DAV/SearchPlugin.php b/src/DAV/SearchPlugin.php index 2a5b823..7c03b5a 100644 --- a/src/DAV/SearchPlugin.php +++ b/src/DAV/SearchPlugin.php @@ -34,9 +34,6 @@ use SearchDAV\XML\SupportedQueryGrammar; class SearchPlugin extends ServerPlugin { const SEARCHDAV_NS = 'https://github.com/icewind1991/SearchDAV/ns'; - /** @var Server */ - private $server; - /** @var ISearchBackend */ private $searchBackend; @@ -58,7 +55,6 @@ class SearchPlugin extends ServerPlugin { } public function initialize(Server $server): void { - $this->server = $server; $this->pathHelper = new PathHelper($server); $this->search = new SearchHandler($this->searchBackend, $this->pathHelper, $server); $this->discover = new DiscoverHandler($this->searchBackend, $this->pathHelper, $this->queryParser); diff --git a/src/Query/Query.php b/src/Query/Query.php index 107b0d3..82f237c 100644 --- a/src/Query/Query.php +++ b/src/Query/Query.php @@ -48,7 +48,7 @@ class Query { * The list of order operations that should be used to order the results. * * Each order operations consists of a property to sort on and a sort direction. - * If more then one order operations are specified, the comparisons for ordering should + * If more than one order operations are specified, the comparisons for ordering should * be applied in the order that the order operations are defined in with the earlier comparisons being * more significant. */ diff --git a/src/XML/BasicSearch.php b/src/XML/BasicSearch.php index 0227927..c5451ca 100644 --- a/src/XML/BasicSearch.php +++ b/src/XML/BasicSearch.php @@ -24,6 +24,7 @@ namespace SearchDAV\XML; use Sabre\Xml\ParseException; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; +use function Sabre\Xml\Deserializer\keyValue; /** * The object representation of a search query made by the client @@ -65,26 +66,33 @@ class BasicSearch implements XmlDeserializable { */ public $limit; + public function __construct(array $select, array $from, ?Operator $where, array $orderBy, Limit $limit) { + $this->select = $select; + $this->from = $from; + $this->where = $where; + $this->orderBy = $orderBy; + $this->limit = $limit; + } + + /** * @param Reader $reader * @return BasicSearch * @throws ParseException */ public static function xmlDeserialize(Reader $reader): BasicSearch { - $search = new self(); - - $elements = \Sabre\Xml\Deserializer\keyValue($reader); + $elements = keyValue($reader); if (!isset($elements['{DAV:}from'])) { throw new ParseException('Missing {DAV:}from when parsing {DAV:}basicsearch'); } - $search->select = $elements['{DAV:}select'] ?? []; - $search->from = $elements['{DAV:}from']; - $search->where = $elements['{DAV:}where'] ?? null; - $search->orderBy = $elements['{DAV:}orderby'] ?? []; - $search->limit = $elements['{DAV:}limit'] ?? new Limit(); - - return $search; + return new BasicSearch( + $elements['{DAV:}select'] ?? [], + $elements['{DAV:}from'], + $elements['{DAV:}where'] ?? null, + $elements['{DAV:}orderby'] ?? [], + $elements['{DAV:}limit'] ?? new Limit() + ); } } diff --git a/src/XML/Limit.php b/src/XML/Limit.php index 71e356c..b00809f 100644 --- a/src/XML/Limit.php +++ b/src/XML/Limit.php @@ -24,6 +24,7 @@ namespace SearchDAV\XML; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; use SearchDAV\DAV\SearchPlugin; +use function Sabre\Xml\Deserializer\keyValue; /** * The limit and offset of a search query @@ -32,7 +33,7 @@ class Limit extends \SearchDAV\Query\Limit implements XmlDeserializable { public static function xmlDeserialize(Reader $reader): Limit { $limit = new self(); - $elements = \Sabre\Xml\Deserializer\keyValue($reader); + $elements = keyValue($reader); $namespace = SearchPlugin::SEARCHDAV_NS; $limit->maxResults = isset($elements['{DAV:}nresults']) ? $elements['{DAV:}nresults'] : 0; diff --git a/src/XML/Order.php b/src/XML/Order.php index e675f78..74eab7e 100644 --- a/src/XML/Order.php +++ b/src/XML/Order.php @@ -23,6 +23,7 @@ namespace SearchDAV\XML; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; +use function Sabre\Xml\Deserializer\keyValue; class Order implements XmlDeserializable { /** @@ -52,7 +53,7 @@ class Order implements XmlDeserializable { public static function xmlDeserialize(Reader $reader): Order { $order = new self(); - $childs = \Sabre\Xml\Deserializer\keyValue($reader); + $childs = keyValue($reader); $order->order = array_key_exists('{DAV:}descending', $childs) ? \SearchDAV\Query\Order::DESC : \SearchDAV\Query\Order::ASC; $order->property = $childs['{DAV:}prop'][0]; diff --git a/src/XML/PropDesc.php b/src/XML/PropDesc.php index b9549cd..43ada6a 100644 --- a/src/XML/PropDesc.php +++ b/src/XML/PropDesc.php @@ -23,6 +23,7 @@ namespace SearchDAV\XML; use Sabre\Xml\Writer; use Sabre\Xml\XmlSerializable; +use SearchDAV\Backend\SearchPropertyDefinition; class PropDesc implements XmlSerializable { /** @@ -46,6 +47,13 @@ class PropDesc implements XmlSerializable { */ public $sortable; + public function __construct(SearchPropertyDefinition $propertyDefinition) { + $this->dataType = $propertyDefinition->dataType; + $this->sortable = $propertyDefinition->sortable; + $this->selectable = $propertyDefinition->selectable; + $this->searchable = $propertyDefinition->searchable; + } + public function xmlSerialize(Writer $writer): void { $data = [ '{DAV:}dataType' => [$this->dataType => null] diff --git a/src/XML/QueryDiscoverResponse.php b/src/XML/QueryDiscoverResponse.php index c1eea4d..c50dea9 100644 --- a/src/XML/QueryDiscoverResponse.php +++ b/src/XML/QueryDiscoverResponse.php @@ -23,6 +23,7 @@ namespace SearchDAV\XML; use Sabre\DAV\Xml\Element\Response; use Sabre\Xml\Writer; +use function Sabre\HTTP\encodePath; class QueryDiscoverResponse extends Response { /** @@ -49,7 +50,7 @@ class QueryDiscoverResponse extends Response { if ($status = $this->getHTTPStatus()) { $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]); } - $writer->writeElement('{DAV:}href', \Sabre\HTTP\encodePath($this->getHref())); + $writer->writeElement('{DAV:}href', encodePath($this->getHref())); if ($this->schema) { $writer->writeElement('{DAV:}query-schema', [ diff --git a/src/XML/Scope.php b/src/XML/Scope.php index 6fb7c0f..90a2384 100644 --- a/src/XML/Scope.php +++ b/src/XML/Scope.php @@ -23,12 +23,13 @@ namespace SearchDAV\XML; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; +use function Sabre\Xml\Deserializer\keyValue; class Scope extends \SearchDAV\Query\Scope implements XmlDeserializable { public static function xmlDeserialize(Reader $reader): Scope { $scope = new self(); - $values = \Sabre\Xml\Deserializer\keyValue($reader); + $values = keyValue($reader); $scope->href = $values['{DAV:}href']; $scope->depth = $values['{DAV:}depth']; diff --git a/tests/DummyBackend.php b/tests/DummyBackend.php index a404416..822a392 100644 --- a/tests/DummyBackend.php +++ b/tests/DummyBackend.php @@ -40,10 +40,10 @@ class DummyBackend implements ISearchBackend { public function getPropertyDefinitionsForScope($href, $path): array { return [ - new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{DAV:}getcontentlength', true, true, true, SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER), new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new SearchPropertyDefinition('{DAV:}displayname', true, true, true), - new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), + new SearchPropertyDefinition('{http://ns.nextcloud.com:}fileid', false, true, true, SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER), ]; } diff --git a/tests/SearchPluginTest.php b/tests/SearchPluginTest.php index d97e91e..7ce28d6 100644 --- a/tests/SearchPluginTest.php +++ b/tests/SearchPluginTest.php @@ -185,7 +185,7 @@ class SearchPluginTest extends TestCase { true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ), new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new SearchPropertyDefinition('{DAV:}displayname', true, true, true), @@ -194,7 +194,7 @@ class SearchPluginTest extends TestCase { false, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ), ]); @@ -289,7 +289,7 @@ class SearchPluginTest extends TestCase { true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ); $orderBy = [ new \SearchDAV\Query\Order($lengthProp, \SearchDAV\Query\Order::ASC), @@ -367,7 +367,7 @@ class SearchPluginTest extends TestCase { true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ); $plugin = new SearchPlugin($this->searchBackend); $server = new Server(); @@ -508,7 +508,7 @@ class SearchPluginTest extends TestCase { false, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ), ]); @@ -548,14 +548,14 @@ class SearchPluginTest extends TestCase { false, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ), new SearchPropertyDefinition( '{DAV:}getcontentlength', true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ), ]); @@ -595,14 +595,14 @@ class SearchPluginTest extends TestCase { false, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ), new SearchPropertyDefinition( '{DAV:}getcontentlength', true, true, true, - SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER + SearchPropertyDefinition::DATATYPE_NON_NEGATIVE_INTEGER ), ]); From 52c8cfc21bd69271f224671c4924d260b0a8d4fb Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 11 Apr 2022 15:02:49 +0200 Subject: [PATCH 45/47] add alias for `DATATYPE_NONNEGATIVE_INTEGER` --- src/Backend/SearchPropertyDefinition.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Backend/SearchPropertyDefinition.php b/src/Backend/SearchPropertyDefinition.php index c8a8879..4dca05b 100644 --- a/src/Backend/SearchPropertyDefinition.php +++ b/src/Backend/SearchPropertyDefinition.php @@ -25,6 +25,7 @@ class SearchPropertyDefinition { const XS = '{http://www.w3.org/2001/XMLSchema}'; const DATATYPE_STRING = self::XS . 'string'; const DATATYPE_INTEGER = self::XS . 'integer'; + const DATATYPE_NONNEGATIVE_INTEGER = self::XS . 'nonNegativeInteger'; const DATATYPE_NON_NEGATIVE_INTEGER = self::XS . 'nonNegativeInteger'; const DATATYPE_DECIMAL = self::XS . 'decimal'; const DATATYPE_DATETIME = self::XS . 'dateTime'; From 168c5f9cc4bc9106ca7f2384e7f2f9a0e8723ad5 Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 14 Nov 2023 17:40:44 +0100 Subject: [PATCH 46/47] Add handling for is-defined operator --- src/DAV/QueryParser.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DAV/QueryParser.php b/src/DAV/QueryParser.php index 440b644..915184e 100644 --- a/src/DAV/QueryParser.php +++ b/src/DAV/QueryParser.php @@ -76,6 +76,7 @@ class QueryParser extends Service { '{DAV:}contains' => Operator::class, '{DAV:}not' => Operator::class, '{DAV:}is-collection' => Operator::class, + '{DAV:}is-defined' => Operator::class, '{DAV:}limit' => Limit::class, ]; } From 2b4e9a481165b84837872460bce6e145bf64dc16 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 8 Nov 2024 12:13:26 +0100 Subject: [PATCH 47/47] feat: Add PHP 8.4 support Signed-off-by: Joas Schilling --- .github/workflows/ci.yml | 2 +- .github/workflows/lint.yml | 2 +- src/Query/Scope.php | 2 +- src/XML/QueryDiscoverResponse.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ad7713..7ad8d77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.4', '8.0'] + php-versions: ['7.4', '8.0', '8.4'] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 75f0f34..2cd12eb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - php-versions: ['7.4', '8.0'] + php-versions: ['7.4', '8.0', '8.4'] name: php${{ matrix.php-versions }} lint steps: - name: Checkout diff --git a/src/Query/Scope.php b/src/Query/Scope.php index faded1c..76b41ae 100644 --- a/src/Query/Scope.php +++ b/src/Query/Scope.php @@ -51,7 +51,7 @@ class Scope { * @param int|string $depth * @param string|null $path */ - public function __construct(string $href = '', $depth = 1, string $path = null) { + public function __construct(string $href = '', $depth = 1, ?string $path = null) { $this->href = $href; $this->depth = $depth; $this->path = $path; diff --git a/src/XML/QueryDiscoverResponse.php b/src/XML/QueryDiscoverResponse.php index c50dea9..0d8b6a2 100644 --- a/src/XML/QueryDiscoverResponse.php +++ b/src/XML/QueryDiscoverResponse.php @@ -38,7 +38,7 @@ class QueryDiscoverResponse extends Response { * @param BasicSearchSchema|null $schema * @param null|int|string $httpStatus */ - public function __construct($href, BasicSearchSchema $schema = null, $httpStatus = null) { + public function __construct($href, ?BasicSearchSchema $schema = null, $httpStatus = null) { if ($httpStatus !== null) { $httpStatus = (string)$httpStatus; }