mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests 

fix PropPatch requests on calendars
This commit is contained in:
Lukas Reschke 2016-11-21 22:54:17 +01:00 committed by GitHub
parent de0df3cfd9 3a8c4230be
commit d0c3c5cee3
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CalDAV/Calendar.php
View File

@ -177,7 +177,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
function propPatch(PropPatch $propPatch) {
$mutations = $propPatch->getMutations();
// If this is a shared calendar, the user can only change the enabled property, to hide it.
if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) && (sizeof($mutations) !== 1 || !isset($mutations['{http://owncloud.org/ns}calendar-enabled']))) {
if ($this->isShared() && (sizeof($mutations) !== 1 || !isset($mutations['{http://owncloud.org/ns}calendar-enabled']))) {
throw new Forbidden();
}
parent::propPatch($propPatch);

25
apps/dav/tests/unit/CalDAV/CalendarTest.php
View File

@ -106,29 +106,40 @@ class CalendarTest extends TestCase {
public function dataPropPatch() {
return [
[[], true],
[[
['user1', 'user2', [], true],
['user1', 'user2', [
'{http://owncloud.org/ns}calendar-enabled' => true,
], false],
[[
['user1', 'user2', [
'{DAV:}displayname' => true,
], true],
[[
['user1', 'user2', [
'{DAV:}displayname' => true,
'{http://owncloud.org/ns}calendar-enabled' => true,
], true],
['user1', 'user1', [], false],
['user1', 'user1', [
'{http://owncloud.org/ns}calendar-enabled' => true,
], false],
['user1', 'user1', [
'{DAV:}displayname' => true,
], false],
['user1', 'user1', [
'{DAV:}displayname' => true,
'{http://owncloud.org/ns}calendar-enabled' => true,
], false],
];
}
/**
* @dataProvider dataPropPatch
*/
public function testPropPatch($mutations, $throws) {
public function testPropPatch($ownerPrincipal, $principalUri, $mutations, $throws) {
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
$calendarInfo = [
'{http://owncloud.org/ns}owner-principal' => 'user1',
'principaluri' => 'user2',
'{http://owncloud.org/ns}owner-principal' => $ownerPrincipal,
'principaluri' => $principalUri,
'id' => 666,
'uri' => 'default'
];