urldecode group principals in Cal- and CardDAV backend

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
This commit is contained in:
Georg Ehrke 2017-06-08 09:08:24 +02:00
parent d00c5886aa
commit dba4935f24
No known key found for this signature in database
GPG Key ID: 9D98FD9380A1CB43
5 changed files with 20 additions and 0 deletions

View File

@ -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);

View File

@ -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();

View File

@ -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))

View File

@ -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']);

View File

@ -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']);