[WiP] accept OCM to groups

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -925,7 +925,7 @@ public function getCardUri($id) {
 		$result->closeCursor();
 
 		if (!isset($uri['uri'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $id);
+			throw new \InvalidArgumentException('Card does not exist: ' . $id);
 		}
 
 		return $uri['uri'];
@@ -1062,7 +1062,7 @@ protected function getCardId($addressBookId, $uri) {
 		$result->closeCursor();
 
 		if (!isset($cardIds['id'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $uri);
+			throw new \InvalidArgumentException('Card does not exist: ' . $uri);
 		}
 
 		return (int)$cardIds['id'];

apps/dav/lib/Command/CleanupChunks.php

@@ -65,7 +65,7 @@ protected function configure() {
 			);
 	}
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$checkUploadExistsLocal = $input->getOption('local') === true;
 		$d = $input->getArgument('minimum-age-in-days');
 		$d = \max(2, \min($d, 100));

apps/dav/lib/Command/CreateAddressBook.php

@@ -64,7 +64,7 @@ protected function configure() {
 				);
 	}
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$user = $input->getArgument('user');
 		if (!$this->userManager->userExists($user)) {
 			throw new \InvalidArgumentException("User <$user> in unknown.");

apps/dav/lib/Command/CreateCalendar.php

@@ -70,7 +70,7 @@ protected function configure() {
 			);
 	}
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$user = $input->getArgument('user');
 		if (!$this->userManager->userExists($user)) {
 			throw new \InvalidArgumentException("User <$user> in unknown.");
@@ -82,7 +82,6 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		$groupPrincipalBackend = new GroupPrincipalBackend(
 			$this->groupManager
 		);
-		$config = \OC::$server->getConfig();
 		$random = \OC::$server->getSecureRandom();
 
 		$name = $input->getArgument('name');

apps/dav/lib/Command/SyncBirthdayCalendar.php

@@ -64,7 +64,7 @@ protected function configure() {
 	 *
 	 * @return int 0 if everything went fine, or an exit code
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$user = $input->getArgument('user');
 		if ($user !== null) {
 			if (!$this->userManager->userExists($user)) {

apps/dav/lib/Command/SyncSystemAddressBook.php

@@ -50,7 +50,7 @@ protected function configure() {
 	 *
 	 * @return int 0 if everything went fine, or an exit code
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$output->writeln('Syncing users ...');
 		$progress = new ProgressBar($output);
 		$progress->start();

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

@@ -66,7 +66,7 @@ public function beforeHandler(RequestInterface $request) {
 			return;
 		}
 
-		$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.3.3');
+		$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '3.2.1');
 
 		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
 		// "mirall/%1" for older releases

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

@@ -220,7 +220,7 @@ public function setETag($etag) {
 	 * size because the actual size value isn't returned by google. This function
 	 * will return null in this case)
 	 *
-	 * @return integer|null
+	 * @return integer|float|null
 	 */
 	public function getSize() {
 		$size = $this->info->getSize();

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

@@ -179,8 +179,8 @@ public function handleBeforeCreateFile($uri, $data, $parent, $modified) {
 	 * This method is called before any HTTP method and validates there is enough free space to store the file
 	 *
 	 * @param string $path path of the user's home
-	 * @param int $length size to check whether it fits
-	 * @param int $extraSpace additional space granted, usually used when overwriting files
+	 * @param int|float $length size to check whether it fits
+	 * @param int|float $extraSpace additional space granted, usually used when overwriting files
 	 * @throws InsufficientStorage
 	 * @return bool
 	 */
@@ -204,25 +204,20 @@ public function checkQuota($path, $length = null, $extraSpace = 0) {
 				$path = \rtrim($parentPath, '/') . '/' . $info['name'];
 			}
 			$freeSpace = $this->getFreeSpace($path);
-			// workaround to guarantee compatibility on 32-bit systems as otherwise this would cause an int overflow on such systems
-			// when $freeSpace is above the max supported value. $freeSpace should be a float so we are using the <= 0.0 comparison
-			if (PHP_INT_SIZE === 4) {
-				$availableSpace = $freeSpace + $extraSpace;
-				if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $freeSpace !== FileInfo::SPACE_UNLIMITED && (($length > $availableSpace) || ($availableSpace <= 0.0))) {
-					if (isset($chunkHandler)) {
-						$chunkHandler->cleanup();
-					}
-					throw new InsufficientStorage();
-				}
-			} else {
-				// freeSpace might be false, or an int. Anyway, make sure that availableSpace will be an int.
-				$availableSpace = (int) $freeSpace + $extraSpace;
-				if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $freeSpace !== FileInfo::SPACE_UNLIMITED && (($length > $availableSpace) || ($availableSpace === 0))) {
-					if (isset($chunkHandler)) {
-						$chunkHandler->cleanup();
-					}
-					throw new InsufficientStorage();
+			if ($freeSpace === false) {
+				$freeSpace = 0;
+			}
+			// There could be cases where both $freeSpace and $extraSpace are floats:
+			// * $freeSpace could come from local storage, which calls disk_free_space, which returns float
+			// * $extraSpace could come from the DB. "size" column is bigint, which is returned as string. The storage
+			// cache uses `0 + $data['size']` where the $data['size'] should be a string, which should return an int if
+			// the result fits inside, but it could also be a float if it doesn't (more likely in 32 bits)
+			$availableSpace = $freeSpace + $extraSpace;
+			if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $freeSpace !== FileInfo::SPACE_UNLIMITED && (($length > $availableSpace) || ($availableSpace <= 0.0))) {
+				if (isset($chunkHandler)) {
+					$chunkHandler->cleanup();
 				}
+				throw new InsufficientStorage();
 			}
 		}
 		return true;

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

@@ -133,7 +133,9 @@ private function getSharesForNodeIds($nodeIDs) {
 			\OCP\Share::SHARE_TYPE_USER,
 			\OCP\Share::SHARE_TYPE_GROUP,
 			\OCP\Share::SHARE_TYPE_LINK,
-			\OCP\Share::SHARE_TYPE_REMOTE
+			\OCP\Share::SHARE_TYPE_REMOTE,
+			\OCP\Share::SHARE_TYPE_REMOTE_GROUP
+
 		];
 
 		// Query DB for share types for specified node IDs

apps/dav/lib/SystemTag/SystemTagPlugin.php

@@ -161,7 +161,7 @@ public function httpPost(RequestInterface $request, ResponseInterface $response)
 	 * @throws Conflict if a tag with the same properties already exists
 	 * @throws UnsupportedMediaType if the content type is not supported
 	 */
-	private function createTag($data, $contentType = 'application/json') {
+	private function createTag($data, $contentType = 'application/json'): ISystemTag {
 		if (\explode(';', $contentType)[0] === 'application/json') {
 			$data = \json_decode($data, true);
 		} else {
@@ -171,6 +171,9 @@ private function createTag($data, $contentType = 'application/json') {
 		if (!isset($data['name'])) {
 			throw new BadRequest('Missing "name" attribute');
 		}
+		if (\strlen($data['name']) > 64) {
+			throw new BadRequest('Tag name too long');
+		}
 
 		$tagName = $data['name'];
 		$userVisible = true;

apps/dav/lib/Upload/ChunkingPlugin.php

@@ -98,6 +98,7 @@ private function verifySize() {
 			return;
 		}
 		$actualSize = $this->sourceNode->getSize();
+		// $actualSize could be either an int or a float
 		if ($expectedSize != $actualSize) {
 			throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize");
 		}

apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php

@@ -91,7 +91,8 @@ public function testGetProperties($shareTypes) {
 			\OCP\Share::SHARE_TYPE_USER,
 			\OCP\Share::SHARE_TYPE_GROUP,
 			\OCP\Share::SHARE_TYPE_LINK,
-			\OCP\Share::SHARE_TYPE_REMOTE
+			\OCP\Share::SHARE_TYPE_REMOTE,
+			\OCP\Share::SHARE_TYPE_REMOTE_GROUP
 		];
 
 		$this->shareManager->expects($this->any())
@@ -172,7 +173,8 @@ public function testPreloadThenGetProperties($shareTypes) {
 			\OCP\Share::SHARE_TYPE_USER,
 			\OCP\Share::SHARE_TYPE_GROUP,
 			\OCP\Share::SHARE_TYPE_LINK,
-			\OCP\Share::SHARE_TYPE_REMOTE
+			\OCP\Share::SHARE_TYPE_REMOTE,
+			\OCP\Share::SHARE_TYPE_REMOTE_GROUP
 		];
 
 		$this->shareManager->expects($this->any())

apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php

@@ -31,6 +31,10 @@
 use OCP\IUserSession;
 use OCP\SystemTag\ISystemTag;
 use OCP\SystemTag\TagAlreadyExistsException;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+use OCA\DAV\SystemTag\SystemTagsByIdCollection;
 
 class SystemTagPluginTest extends \Test\TestCase {
 	public const ID_PROPERTYNAME = \OCA\DAV\SystemTag\SystemTagPlugin::ID_PROPERTYNAME;
@@ -383,7 +387,7 @@ public function createTagInsufficientPermissionsProvider() {
 	 * @dataProvider createTagInsufficientPermissionsProvider
 	 */
 	public function testCreateNotAssignableTagAsRegularUser($userVisible, $userAssignable, $userEditable, $groups) {
-		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectException(BadRequest::class);
 		$this->expectExceptionMessage('Not sufficient permissions');
 
 		$this->user->expects($this->once())
@@ -442,6 +446,54 @@ public function testCreateNotAssignableTagAsRegularUser($userVisible, $userAssig
 		$this->plugin->httpPost($request, $response);
 	}
 
+	public function testPostTooLongTagName(): void {
+		$this->expectException(BadRequest::class);
+		$this->expectExceptionMessage('Tag name too long');
+
+		$requestData = [
+			'name' => 'ThisTagNameIsByFarTooLong.ThisTagNameIsByFarTooLong.ThisTagNameIsByFarTooLong',
+			'userVisible' => true,
+			'userAssignable' => true,
+			'userEditable' => true
+		];
+		$requestData = \json_encode($requestData);
+
+		$node = $this->getMockBuilder(SystemTagsByIdCollection::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$this->tagManager->expects($this->never())
+			->method('createTag');
+		$this->tagManager->expects($this->never())
+			->method('setTagGroups');
+
+		$this->tree
+			->method('getNodeForPath')
+			->with('/systemtags')
+			->willReturn($node);
+
+		$request = $this->getMockBuilder(RequestInterface::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$response = $this->getMockBuilder(ResponseInterface::class)
+			->disableOriginalConstructor()
+			->getMock();
+
+		$request->expects($this->once())
+			->method('getPath')
+			->willReturn('/systemtags');
+
+		$request->expects($this->once())
+			->method('getBodyAsString')
+			->willReturn($requestData);
+
+		$request->expects($this->once())
+			->method('getHeader')
+			->with('Content-Type')
+			->willReturn('application/json');
+
+		$this->plugin->httpPost($request, $response);
+	}
+
 	public function testCreateTagInByIdCollectionAsRegularUser() {
 		$systemTag = new SystemTag(1, 'Test', true, false);
 

apps/federatedfilesharing/l10n/en_GB.js

@@ -2,7 +2,9 @@ OC.L10N.register(
     "federatedfilesharing",
     {
     "Federated sharing" : "Federated sharing",
+    "Add to" : "Add to",
     "Loading..." : "Loading...",
+    "Change server..." : "Change server...",
     "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID",
     "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
     "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",
@@ -19,8 +21,10 @@ OC.L10N.register(
     "Share with me through my #ownCloud Federated Cloud ID" : "Share with me through my #ownCloud Federated Cloud ID",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "Open documentation" : "Open documentation",
+    "Periodically synchronize outdated federated shares for active users" : "Periodically synchronise outdated federated shares for active users",
     "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers",
     "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers",
+    "Automatically accept federated shares from trusted servers" : "Automatically accept federated shares from trusted servers",
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Your Federated Cloud ID:",
     "Share it:" : "Share it:",

apps/federatedfilesharing/l10n/en_GB.json

@@ -1,6 +1,8 @@
 { "translations": {
     "Federated sharing" : "Federated sharing",
+    "Add to" : "Add to",
     "Loading..." : "Loading...",
+    "Change server..." : "Change server...",
     "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID",
     "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
     "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",
@@ -17,8 +19,10 @@
     "Share with me through my #ownCloud Federated Cloud ID" : "Share with me through my #ownCloud Federated Cloud ID",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "Open documentation" : "Open documentation",
+    "Periodically synchronize outdated federated shares for active users" : "Periodically synchronise outdated federated shares for active users",
     "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers",
     "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers",
+    "Automatically accept federated shares from trusted servers" : "Automatically accept federated shares from trusted servers",
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Your Federated Cloud ID:",
     "Share it:" : "Share it:",

apps/federatedfilesharing/lib/AppInfo/Application.php

@@ -140,24 +140,16 @@ function ($c) use ($server) {
 					$server->getUserManager(),
 					$c->query('AddressHandler'),
 					$c->query('FederatedShareManager'),
-					$server->getLogger()
+					$server->getLogger(),
+					$server->getConfig()
 				);
 			}
 		);
 
 		$container->registerService(
 			'NotificationManager',
 			function ($c) {
-				return new NotificationManager(
-					$c->query('Permissions')
-				);
-			}
-		);
-
-		$container->registerService(
-			'Permissions',
-			function ($c) {
-				return new Permissions();
+				return new NotificationManager();
 			}
 		);
 
@@ -208,9 +200,7 @@ protected function initFederatedShareProvider() {
 			\OC::$server->getMemCacheFactory(),
 			\OC::$server->getHTTPClientService()
 		);
-		$notificationManager = new NotificationManager(
-			new Permissions()
-		);
+		$notificationManager = new NotificationManager();
 		$notifications = new Notifications(
 			$addressHandler,
 			\OC::$server->getHTTPClientService(),

apps/federatedfilesharing/lib/Command/PollIncomingShares.php

@@ -79,9 +79,9 @@ protected function configure() {
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
 	 *
-	 * @return int|null|void
+	 * @return int
 	 */
-	public function execute(InputInterface $input, OutputInterface $output) {
+	public function execute(InputInterface $input, OutputInterface $output): int {
 		$output->writeln("WARNING: incoming-shares:poll has been deprecated and replaced by periodic external shares cronjob. Please check Federated Cloud Sharing settings and documentation.");
 		if ($this->externalMountProvider === null) {
 			$output->writeln("Polling is not possible when files_sharing app is disabled. Please enable it with 'occ app:enable files_sharing'");
@@ -134,6 +134,7 @@ public function execute(InputInterface $input, OutputInterface $output) {
 			}
 		}
 		$cursor->closeCursor();
+		return 0;
 	}
 
 	/**