From dba4935f240f6a9b3d3d1009d29a02fbe4f9347e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 8 Jun 2017 09:08:24 +0200 Subject: [PATCH] urldecode group principals in Cal- and CardDAV backend Signed-off-by: Georg Ehrke --- apps/dav/lib/CalDAV/CalDavBackend.php | 3 +++ apps/dav/lib/CardDAV/CardDavBackend.php | 3 +++ apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php | 3 +++ apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php | 7 +++++++ apps/dav/tests/unit/CardDAV/CardDavBackendTest.php | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index ef3df8de83..7fe18cd865 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -276,6 +276,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription // query for shared calendars $principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true); + $principals = array_map(function($principal) { + return urldecode($principal); + }, $principals); $principals[]= $principalUri; $fields = array_values($this->propertyMap); diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 983220c6ba..5742f97b70 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -162,6 +162,9 @@ class CardDavBackend implements BackendInterface, SyncSupport { // query for shared calendars $principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true); + $principals = array_map(function($principal) { + return urldecode($principal); + }, $principals); $principals[]= $principalUri; $query = $this->db->getQueryBuilder(); diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php index bc161b00d9..a7bf4432c6 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php @@ -91,6 +91,9 @@ abstract class AbstractCalDavBackendTest extends TestCase { if (is_null($this->backend)) { return; } + $this->principal->expects($this->any())->method('getGroupMembership') + ->withAnyParameters() + ->willReturn([self::UNIT_TEST_GROUP, self::UNIT_TEST_GROUP2]); $calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER); foreach ($calendars as $calendar) { $this->dispatcher->expects($this->at(0)) diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php index 7c424fd0dd..eb9f9cd10d 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php @@ -46,6 +46,10 @@ class PublicCalendarRootTest extends TestCase { $this->random = \OC::$server->getSecureRandom(); $dispatcher = $this->createMock(EventDispatcherInterface::class); + $this->principal->expects($this->any())->method('getGroupMembership') + ->withAnyParameters() + ->willReturn([]); + $this->backend = new CalDavBackend( $db, $this->principal, @@ -66,6 +70,9 @@ class PublicCalendarRootTest extends TestCase { if (is_null($this->backend)) { return; } + $this->principal->expects($this->any())->method('getGroupMembership') + ->withAnyParameters() + ->willReturn([]); $books = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER); foreach ($books as $book) { $this->backend->deleteCalendar($book['id']); diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php index f3a271a2db..8ca7e8a33b 100644 --- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php +++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php @@ -113,6 +113,10 @@ class CardDavBackendTest extends TestCase { if (is_null($this->backend)) { return; } + + $this->principal->method('getGroupMembership') + ->withAnyParameters() + ->willReturn([self::UNIT_TEST_GROUP]); $books = $this->backend->getAddressBooksForUser(self::UNIT_TEST_USER); foreach ($books as $book) { $this->backend->deleteAddressBook($book['id']);