Update sabre dav to 3.2 (#26115)

* Update sabre/dav to 3.2.0

* Adjust code to work with sabre/dav 3.2.0 and it's dependencies

* Adding own CalDAV plugin to fix calendar home property

* Test if there is a user logged in when listing files home

* Update sabre version used by integration tests

* Disable unauthenticated DAV access

This is needed to make Sabre 3.2 behave like we did before.
Eventually we should integrate better with the ACL plugin which itself
should implement an auth failure when appropriate.

apps/dav/lib/CalDAV/CalendarObject.php

@@ -64,7 +64,7 @@ private static function createConfidentialObject($calData) {
 			$vElement = $vObject->VTODO;
 		}
 		if(!is_null($vElement)) {
-			foreach ($vElement->children as &$property) {
+			foreach ($vElement->children() as &$property) {
 				/** @var Property $property */
 				switch($property->name) {
 					case 'CREATED':

apps/dav/lib/CalDAV/Plugin.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2016, ownCloud GmbH.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\DAV\CalDAV;
+
+use Sabre\HTTP\URLUtil;
+
+class Plugin extends \Sabre\CalDAV\Plugin {
+
+	/**
+	 * @inheritdoc
+	 */
+	function getCalendarHomeForPrincipal($principalUrl) {
+
+		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
+			list(, $principalId) = URLUtil::splitPath($principalUrl);
+			return self::CALENDAR_ROOT .'/' . $principalId;
+		}
+
+		return;
+	}
+
+}

apps/dav/lib/CardDAV/AddressBookImpl.php

@@ -27,7 +27,6 @@
 use OCP\IAddressBook;
 use OCP\IURLGenerator;
 use Sabre\VObject\Component\VCard;
-use Sabre\VObject\Property\Text;
 use Sabre\VObject\Reader;
 use Sabre\VObject\UUIDUtil;
 
@@ -207,7 +206,7 @@ protected function getUid() {
 	 */
 	protected function createEmptyVCard($uid) {
 		$vCard = new VCard();
-		$vCard->add(new Text($vCard, 'UID', $uid));
+		$vCard->UID = $uid;
 		return $vCard;
 	}
 
@@ -223,7 +222,7 @@ protected function vCard2Array($uri, VCard $vCard) {
 			'URI' => $uri,
 		];
 
-		foreach ($vCard->children as $property) {
+		foreach ($vCard->children() as $property) {
 			$result[$property->name] = $property->getValue();
 			if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
 				$url = $this->urlGenerator->getAbsoluteURL(

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -902,7 +902,7 @@ protected function updateProperties($addressBookId, $cardUri, $vCardSerialized)
 				]
 			);
 
-		foreach ($vCard->children as $property) {
+		foreach ($vCard->children() as $property) {
 			if(!in_array($property->name, self::$indexProperties)) {
 				continue;
 			}

apps/dav/lib/CardDAV/Converter.php

@@ -42,16 +42,17 @@ public function createCardFromUser(IUser $user) {
 		$image = $this->getAvatarImage($user);
 
 		$vCard = new VCard();
-		$vCard->add(new Text($vCard, 'UID', $uid));
+		$vCard->VERSION = '3.0';
+		$vCard->UID = $uid;
 		if (!empty($displayName)) {
-			$vCard->add(new Text($vCard, 'FN', $displayName));
-			$vCard->add(new Text($vCard, 'N', $this->splitFullName($displayName)));
+			$vCard->FN = $displayName;
+			$vCard->N = $this->splitFullName($displayName);
 		}
 		if (!empty($emailAddress)) {
 			$vCard->add(new Text($vCard, 'EMAIL', $emailAddress, ['TYPE' => 'OTHER']));
 		}
 		if (!empty($cloudId)) {
-			$vCard->add(new Text($vCard, 'CLOUD', $cloudId));
+			$vCard->CLOUD = $cloudId;
 		}
 		if ($image) {
 			$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);

apps/dav/lib/Connector/Sabre/DavAclPlugin.php

@@ -36,6 +36,7 @@
 class DavAclPlugin extends \Sabre\DAVACL\Plugin {
 	public function __construct() {
 		$this->hideNodesFromListings = true;
+		$this->allowUnauthenticatedAccess = false;
 	}
 
 	function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {

apps/dav/lib/Files/RootCollection.php

@@ -39,7 +39,7 @@ class RootCollection extends AbstractPrincipalCollection {
 	function getChildForPrincipal(array $principalInfo) {
 		list(,$name) = URLUtil::splitPath($principalInfo['uri']);
 		$user = \OC::$server->getUserSession()->getUser();
-		if ($name !== $user->getUID()) {
+		if (is_null($user) || $name !== $user->getUID()) {
 			// a user is only allowed to see their own home contents, so in case another collection
 			// is accessed, we return a simple empty collection for now
 			// in the future this could be considered to be used for accessing shared files

apps/dav/lib/Server.php

@@ -107,7 +107,7 @@ public function __construct(IRequest $request, $baseUri) {
 		$this->server->addPlugin($acl);
 
 		// calendar plugins
-		$this->server->addPlugin(new \Sabre\CalDAV\Plugin());
+		$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
 		$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
 		$this->server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin());
 		$this->server->addPlugin(new IMipPlugin($mailer, $logger));

apps/dav/tests/unit/CalDAV/CalDavBackendTest.php

@@ -417,8 +417,8 @@ public function testGetDenormalizedData($expected, $key, $calData) {
 
 	public function providesCalDataForGetDenormalizedData() {
 		return [
-			'first occurrence before unix epoch starts' => [0, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.2//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nDTSTART;VALUE=DATE:16040222\r\nDTEND;VALUE=DATE:16040223\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
-			'no first occurrence because yearly' => [null, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.2//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+			'first occurrence before unix epoch starts' => [0, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nDTSTART;VALUE=DATE:16040222\r\nDTEND;VALUE=DATE:16040223\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
+			'no first occurrence because yearly' => [null, 'firstOccurence', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 4.1.1//EN\r\nCALSCALE:GREGORIAN\r\nBEGIN:VEVENT\r\nUID:413F269B-B51B-46B1-AFB6-40055C53A4DC\r\nDTSTAMP:20160309T095056Z\r\nRRULE:FREQ=YEARLY\r\nSUMMARY:SUMMARY\r\nTRANSP:TRANSPARENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"],
 			'CLASS:PRIVATE' => [CalDavBackend::CLASSIFICATION_PRIVATE, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PRIVATE\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 			'CLASS:PUBLIC' => [CalDavBackend::CLASSIFICATION_PUBLIC, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:PUBLIC\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],
 			'CLASS:CONFIDENTIAL' => [CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'classification', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//dmfs.org//mimedir.icalendar//EN\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nX-LIC-LOCATION:Europe/Berlin\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nTZNAME:CEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nTZNAME:CET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nDTSTART;TZID=Europe/Berlin:20160419T130000\r\nSUMMARY:Test\r\nCLASS:CONFIDENTIAL\r\nTRANSP:OPAQUE\r\nSTATUS:CONFIRMED\r\nDTEND;TZID=Europe/Berlin:20160419T140000\r\nLAST-MODIFIED:20160419T074202Z\r\nDTSTAMP:20160419T074202Z\r\nCREATED:20160419T074202Z\r\nUID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310\r\nEND:VEVENT\r\nEND:VCALENDAR"],

apps/dav/tests/unit/CalDAV/CalendarTest.php

@@ -49,7 +49,7 @@ public function setUp() {
 
 	public function testDelete() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
+		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
 		$backend->expects($this->once())->method('updateShares');
 		$backend->expects($this->any())->method('getShares')->willReturn([
 			['href' => 'principal:user2']
@@ -69,7 +69,7 @@ public function testDelete() {
 	 */
 	public function testDeleteFromGroup() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
+		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
 		$backend->expects($this->never())->method('updateShares');
 		$backend->expects($this->any())->method('getShares')->willReturn([
 			['href' => 'principal:group2']
@@ -105,7 +105,7 @@ public function dataPropPatch() {
 	 */
 	public function testPropPatch($mutations, $throws) {
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
+		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
 		$calendarInfo = [
 			'{http://owncloud.org/ns}owner-principal' => 'user1',
 			'principaluri' => 'user2',
@@ -128,7 +128,7 @@ public function testPropPatch($mutations, $throws) {
 	 */
 	public function testAcl($expectsWrite, $readOnlyValue, $hasOwnerSet, $uri = 'default') {
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
+		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
 		$backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1);
 		$calendarInfo = [
 			'principaluri' => 'user2',
@@ -203,7 +203,7 @@ public function testPrivateClassification($expectedChildren, $isShared) {
 		$calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE];
 
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
+		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
 		$backend->expects($this->any())->method('getCalendarObjects')->willReturn([
 			$calObject0, $calObject1, $calObject2
 		]);
@@ -290,7 +290,7 @@ public function testConfidentialClassification($expectedChildren, $isShared) {
 		$calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE];
 
 		/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
-		$backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
+		$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
 		$backend->expects($this->any())->method('getCalendarObjects')->willReturn([
 			$calObject0, $calObject1, $calObject2
 		]);

apps/dav/tests/unit/CardDAV/AddressBookImplTest.php

@@ -29,6 +29,7 @@
 use OCA\DAV\CardDAV\AddressBook;
 use OCA\DAV\CardDAV\AddressBookImpl;
 use OCA\DAV\CardDAV\CardDavBackend;
+use OCP\IURLGenerator;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Property\Text;
 use Test\TestCase;
@@ -44,7 +45,7 @@ class AddressBookImplTest extends TestCase {
 	/** @var  AddressBook | \PHPUnit_Framework_MockObject_MockObject */
 	private $addressBook;
 
-	/** @var \OCP\IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */
+	/** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */
 	private $urlGenerator;
 
 	/** @var  CardDavBackend | \PHPUnit_Framework_MockObject_MockObject */
@@ -60,12 +61,12 @@ public function setUp() {
 			'id' => 42,
 			'{DAV:}displayname' => 'display name'
 		];
-		$this->addressBook = $this->getMockBuilder('OCA\DAV\CardDAV\AddressBook')
+		$this->addressBook = $this->getMockBuilder(AddressBook::class)
 			->disableOriginalConstructor()->getMock();
-		$this->backend = $this->getMockBuilder('\OCA\DAV\CardDAV\CardDavBackend')
+		$this->backend = $this->getMockBuilder(CardDavBackend::class)
 			->disableOriginalConstructor()->getMock();
-		$this->vCard = $this->createMock('Sabre\VObject\Component\VCard');
-		$this->urlGenerator = $this->createMock('OCP\IURLGenerator');
+		$this->vCard = $this->createMock(VCard::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 
 		$this->addressBookImpl = new AddressBookImpl(
 			$this->addressBook,
@@ -88,7 +89,7 @@ public function testGetDisplayName() {
 	public function testSearch() {
 
 		/** @var \PHPUnit_Framework_MockObject_MockObject | AddressBookImpl $addressBookImpl */
-		$addressBookImpl = $this->getMockBuilder('OCA\DAV\CardDAV\AddressBookImpl')
+		$addressBookImpl = $this->getMockBuilder(AddressBookImpl::class)
 			->setConstructorArgs(
 				[
 					$this->addressBook,
@@ -135,7 +136,7 @@ public function testCreate($properties) {
 		$uid = 'uid';
 
 		/** @var \PHPUnit_Framework_MockObject_MockObject | AddressBookImpl $addressBookImpl */
-		$addressBookImpl = $this->getMockBuilder('OCA\DAV\CardDAV\AddressBookImpl')
+		$addressBookImpl = $this->getMockBuilder(AddressBookImpl::class)
 			->setConstructorArgs(
 				[
 					$this->addressBook,
@@ -176,7 +177,7 @@ public function testUpdate() {
 		$properties = ['URI' => $uri, 'UID' => $uid, 'FN' => 'John Doe'];
 
 		/** @var \PHPUnit_Framework_MockObject_MockObject | AddressBookImpl $addressBookImpl */
-		$addressBookImpl = $this->getMockBuilder('OCA\DAV\CardDAV\AddressBookImpl')
+		$addressBookImpl = $this->getMockBuilder(AddressBookImpl::class)
 			->setConstructorArgs(
 				[
 					$this->addressBook,
@@ -259,7 +260,7 @@ public function testReadCard() {
 
 	public function testCreateUid() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject | AddressBookImpl $addressBookImpl */
-		$addressBookImpl = $this->getMockBuilder('OCA\DAV\CardDAV\AddressBookImpl')
+		$addressBookImpl = $this->getMockBuilder(AddressBookImpl::class)
 			->setConstructorArgs(
 				[
 					$this->addressBook,
@@ -291,7 +292,7 @@ function($id, $uid) {
 	public function testCreateEmptyVCard() {
 		$uid = 'uid';
 		$expectedVCard = new VCard();
-		$expectedVCard->add(new Text($expectedVCard, 'UID', $uid));
+		$expectedVCard->UID = $uid;
 		$expectedVCardSerialized = $expectedVCard->serialize();
 
 		$result = $this->invokePrivate($this->addressBookImpl, 'createEmptyVCard', [$uid]);