Fix ACLs on shared calendars

owncloud · Jan 28, 2016 · 16b682a · 16b682a
1 parent 0b265e5
commit 16b682a
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 19 deletions.
diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/caldav/caldavbackend.php
@@ -203,6 +203,7 @@ function getCalendarsForUser($principalUri) {
 			list(, $name) = URLUtil::splitPath($row['principaluri']);
 			$uri = $row['uri'] . '_shared_by_' . $name;
 			$row['displayname'] = $row['displayname'] . "($name)";
+			$readOnly = ($row['access'] == Backend::ACCESS_READ);
 			$components = [];
 			if ($row['components']) {
 				$components = explode(',',$row['components']);
@@ -216,7 +217,7 @@ function getCalendarsForUser($principalUri) {
 				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
 				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
 				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => $row['access'] === Backend::ACCESS_READ,
+				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => $readOnly,
 			];
 
 			foreach($this->propertyMap as $xmlName=>$dbName) {

diff --git a/apps/dav/lib/caldav/calendar.php b/apps/dav/lib/caldav/calendar.php
@@ -58,23 +58,6 @@ public function getResourceId() {
 	function getACL() {
 		$acl = parent::getACL();
 
-		// add the current user
-		if (isset($this->calendarInfo['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'])) {
-			$owner = $this->calendarInfo['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'];
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => $owner,
-				'protected' => true,
-			];
-			if ($this->calendarInfo['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only']) {
-				$acl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => $owner,
-					'protected' => true,
-				];
-			}
-		}
-
 		/** @var CalDavBackend $caldavBackend */
 		$caldavBackend = $this->caldavBackend;
 		return $caldavBackend->applyShareAcl($this->getResourceId(), $acl);

diff --git a/apps/dav/lib/dav/sharing/backend.php b/apps/dav/lib/dav/sharing/backend.php
@@ -136,7 +136,7 @@ public function getShares($resourceId) {
 				'href' => "principal:${row['principaluri']}",
 //				'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '',
 				'status' => 1,
-				'readOnly' => ($row['access'] === self::ACCESS_READ),
+				'readOnly' => ($row['access'] == self::ACCESS_READ),
 				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal' => $row['principaluri']
 			];
 		}

diff --git a/apps/dav/tests/unit/caldav/caldavbackendtest.php b/apps/dav/tests/unit/caldav/caldavbackendtest.php
@@ -117,13 +117,50 @@ public function testCalendarSharing() {
 		$this->backend->updateShares($calendar, [
 			[
 				'href' => 'principal:' . self::UNIT_TEST_USER1,
+				'readOnly' => false
 			],
 			[
 				'href' => 'principal:' . self::UNIT_TEST_GROUP,
+				'readOnly' => false
 			]
 		], []);
 		$books = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1);
 		$this->assertEquals(1, count($books));
+		$calendar = new Calendar($this->backend, $books[0]);
+		$acl = $calendar->getACL();
+		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
+		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
+		$this->assertAcl(self::UNIT_TEST_USER1, '{DAV:}read', $acl);
+		$this->assertAcl(self::UNIT_TEST_USER1, '{DAV:}write', $acl);
+		$this->assertAcl(self::UNIT_TEST_GROUP, '{DAV:}read', $acl);
+		$this->assertAcl(self::UNIT_TEST_GROUP, '{DAV:}write', $acl);
+
+		// delete the address book
+		$this->backend->deleteCalendar($books[0]['id']);
+		$books = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+		$this->assertEquals(0, count($books));
+	}
+
+	public function testCalendarReadOnlySharing() {
+
+		$this->createTestCalendar();
+		$books = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
+		$this->assertEquals(1, count($books));
+		$calendar = new Calendar($this->backend, $books[0]);
+		$this->backend->updateShares($calendar, [
+			[
+				'href' => 'principal:' . self::UNIT_TEST_USER1,
+				'readOnly' => true
+			]
+		], []);
+		$books = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER1);
+		$this->assertEquals(1, count($books));
+		$calendar = new Calendar($this->backend, $books[0]);
+		$acl = $calendar->getACL();
+		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}read', $acl);
+		$this->assertAcl(self::UNIT_TEST_USER, '{DAV:}write', $acl);
+		$this->assertAcl(self::UNIT_TEST_USER1, '{DAV:}read', $acl);
+		$this->assertNotAcl(self::UNIT_TEST_USER1, '{DAV:}write', $acl);
 
 		// delete the address book
 		$this->backend->deleteCalendar($books[0]['id']);
@@ -386,4 +423,24 @@ public function testScheduling() {
 		$sos = $this->backend->getSchedulingObjects(self::UNIT_TEST_USER);
 		$this->assertEquals(0, count($sos));
 	}
+
+	private function assertAcl($principal, $privilege, $acl) {
+		foreach($acl as $a) {
+			if ($a['principal'] === $principal && $a['privilege'] === $privilege) {
+				$this->assertTrue(true);
+				return;
+			}
+		}
+		$this->fail("ACL does not contain $principal / $privilege");
+	}
+
+	private function assertNotAcl($principal, $privilege, $acl) {
+		foreach($acl as $a) {
+			if ($a['principal'] === $principal && $a['privilege'] === $privilege) {
+				$this->fail("ACL contains $principal / $privilege");
+				return;
+			}
+		}
+		$this->assertTrue(true);
+	}
 }