🔗☑️ Accept all incoming shares

apps/federatedfilesharing/lib/Notifier.php

@@ -86,7 +86,7 @@ public function getName(): string {
 	 * @throws \InvalidArgumentException
 	 */
 	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'files_sharing') {
+		if ($notification->getApp() !== 'files_sharing' || $notification->getObjectType() !== 'remote_share') {
 			// Not my app => throw
 			throw new \InvalidArgumentException();
 		}

apps/files_sharing/appinfo/app.php

@@ -38,6 +38,7 @@
 
 $application = \OC::$server->query(Application::class);
 $application->registerMountProviders();
+$application->register();
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(

apps/files_sharing/appinfo/info.xml

@@ -9,7 +9,7 @@
 Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation.
 
 	</description>
-	<version>1.10.0</version>
+	<version>1.10.1</version>
 	<licence>agpl</licence>
 	<author>Michael Gapczynski</author>
 	<author>Bjoern Schiessle</author>
@@ -36,6 +36,7 @@ Turning the feature off removes shared files and folders on the server for all s
 		<post-migration>
 			<step>OCA\Files_Sharing\Migration\OwncloudGuestShareType</step>
 			<step>OCA\Files_Sharing\Migration\SetPasswordColumn</step>
+			<step>OCA\Files_Sharing\Migration\SetAcceptedStatus</step>
 		</post-migration>
 	</repair-steps>
 

apps/files_sharing/appinfo/routes.php

@@ -73,6 +73,11 @@
 			'url'  => '/api/v1/shares/{id}',
 			'verb' => 'DELETE',
 		],
+		[
+			'name' => 'ShareAPI#acceptShare',
+			'url'  => '/api/v1/shares/pending/{id}',
+			'verb' => 'POST',
+		],
 		/*
 		 * Deleted Shares
 		 */

apps/files_sharing/composer/composer/autoload_classmap.php

@@ -49,8 +49,10 @@
     'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => $baseDir . '/../lib/Middleware/ShareInfoMiddleware.php',
     'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => $baseDir . '/../lib/Middleware/SharingCheckMiddleware.php',
     'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => $baseDir . '/../lib/Migration/OwncloudGuestShareType.php',
+    'OCA\\Files_Sharing\\Migration\\SetAcceptedStatus' => $baseDir . '/../lib/Migration/SetAcceptedStatus.php',
     'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => $baseDir . '/../lib/Migration/SetPasswordColumn.php',
     'OCA\\Files_Sharing\\MountProvider' => $baseDir . '/../lib/MountProvider.php',
+    'OCA\\Files_Sharing\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
     'OCA\\Files_Sharing\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
     'OCA\\Files_Sharing\\Scanner' => $baseDir . '/../lib/Scanner.php',
     'OCA\\Files_Sharing\\ShareBackend\\File' => $baseDir . '/../lib/ShareBackend/File.php',

apps/files_sharing/composer/composer/autoload_static.php

@@ -64,8 +64,10 @@ class ComposerStaticInitFiles_Sharing
         'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/ShareInfoMiddleware.php',
         'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/SharingCheckMiddleware.php',
         'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => __DIR__ . '/..' . '/../lib/Migration/OwncloudGuestShareType.php',
+        'OCA\\Files_Sharing\\Migration\\SetAcceptedStatus' => __DIR__ . '/..' . '/../lib/Migration/SetAcceptedStatus.php',
         'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => __DIR__ . '/..' . '/../lib/Migration/SetPasswordColumn.php',
         'OCA\\Files_Sharing\\MountProvider' => __DIR__ . '/..' . '/../lib/MountProvider.php',
+        'OCA\\Files_Sharing\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
         'OCA\\Files_Sharing\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
         'OCA\\Files_Sharing\\Scanner' => __DIR__ . '/..' . '/../lib/Scanner.php',
         'OCA\\Files_Sharing\\ShareBackend\\File' => __DIR__ . '/..' . '/../lib/ShareBackend/File.php',

apps/files_sharing/lib/AppInfo/Application.php

@@ -32,6 +32,7 @@
 use OCA\Files_Sharing\Middleware\OCSShareAPIMiddleware;
 use OCA\Files_Sharing\Middleware\ShareInfoMiddleware;
 use OCA\Files_Sharing\MountProvider;
+use OCA\Files_Sharing\Notification\Listener;
 use OCA\Files_Sharing\Notification\Notifier;
 use OCP\AppFramework\App;
 use OC\AppFramework\Utility\SimpleContainer;
@@ -42,9 +43,11 @@
 use OCP\Defaults;
 use OCP\Federation\ICloudIdManager;
 use \OCP\IContainer;
+use OCP\IGroup;
 use OCP\IServerContainer;
 use OCA\Files_Sharing\Capabilities;
 use OCA\Files_Sharing\External\Manager;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
 	public function __construct(array $urlParams = array()) {
@@ -178,4 +181,18 @@ public function registerMountProviders() {
 		$mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
 		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
 	}
+
+	public function register(): void {
+		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+		$dispatcher->addListener('OCP\Share::postShare', function(GenericEvent $event) {
+			/** @var Listener $listener */
+			$listener = $this->getContainer()->query(Listener::class);
+			$listener->shareNotification($event);
+		});
+		$dispatcher->addListener(IGroup::class . '::postAddUser', function(GenericEvent $event) {
+			/** @var Listener $listener */
+			$listener = $this->getContainer()->query(Listener::class);
+			$listener->userAddedToGroup($event);
+		});
+	}
 }

apps/files_sharing/lib/Controller/ShareAPIController.php

@@ -946,6 +946,38 @@ public function updateShare(
 		return new DataResponse($this->formatShare($share));
 	}
 
+	/**
+	 * @NoAdminRequired
+	 *
+	 * @param string $id
+	 * @return DataResponse
+	 * @throws OCSNotFoundException
+	 * @throws OCSException
+	 * @throws OCSBadRequestException
+	 */
+	public function acceptShare(string $id): DataResponse {
+		try {
+			$share = $this->getShareById($id);
+		} catch (ShareNotFound $e) {
+			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+		}
+
+		if (!$this->canAccessShare($share)) {
+			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+		}
+
+		try {
+			$this->shareManager->acceptShare($share, $this->currentUser);
+		} catch (GenericShareException $e) {
+			$code = $e->getCode() === 0 ? 403 : $e->getCode();
+			throw new OCSException($e->getHint(), $code);
+		} catch (\Exception $e) {
+			throw new OCSBadRequestException($e->getMessage(), $e);
+		}
+
+		return new DataResponse();
+	}
+
 	/**
 	 * Does the user have read permission on the share
 	 *
@@ -1078,8 +1110,8 @@ protected function canDeleteShare(\OCP\Share\IShare $share): bool {
 	 * @suppress PhanUndeclaredClassMethod
 	 */
 	protected function canDeleteShareFromSelf(\OCP\Share\IShare $share): bool {
-		if ($share->getShareType() !== Share::SHARE_TYPE_GROUP &&
-			$share->getShareType() !== Share::SHARE_TYPE_ROOM
+		if ($share->getShareType() !== IShare::TYPE_GROUP &&
+			$share->getShareType() !== IShare::TYPE_ROOM
 		) {
 			return false;
 		}

apps/files_sharing/lib/External/Manager.php

@@ -44,6 +44,7 @@
 use OCP\Notification\IManager;
 use OCP\OCS\IDiscoveryService;
 use OCP\Share;
+use OCP\Share\IShare;
 
 class Manager {
 	const STORAGE = '\OCA\Files_Sharing\External\Storage';
@@ -151,10 +152,10 @@ public function __construct(IDBConnection $connection,
 	public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted=false, $user = null, $remoteId = -1, $parent = -1) {
 
 		$user = $user ? $user : $this->uid;
-		$accepted = $accepted ? 1 : 0;
+		$accepted = $accepted ? IShare::STATUS_ACCEPTED : IShare::STATUS_PENDING;
 		$name = Filesystem::normalizePath('/' . $name);
 
-		if (!$accepted) {
+		if ($accepted !== IShare::STATUS_ACCEPTED)  {
 			// To avoid conflicts with the mount point generation later,
 			// we only use a temporary mount point name here. The real
 			// mount point name will be generated when accepting the share,

apps/files_sharing/lib/Migration/SetAcceptedStatus.php

@@ -0,0 +1,79 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2019, Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_Sharing\Migration;
+
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+use OCP\Share\IShare;
+
+class SetAcceptedStatus implements IRepairStep {
+
+	/** @var IDBConnection */
+	private $connection;
+
+	/** @var  IConfig */
+	private $config;
+
+
+	public function __construct(IDBConnection $connection, IConfig $config) {
+		$this->connection = $connection;
+		$this->config = $config;
+	}
+
+	/**
+	 * Returns the step's name
+	 *
+	 * @return string
+	 * @since 9.1.0
+	 */
+	public function getName(): string {
+		return 'Set existing shares as accepted';
+	}
+
+	/**
+	 * @param IOutput $output
+	 */
+	public function run(IOutput $output): void {
+		if (!$this->shouldRun()) {
+			return;
+		}
+
+		$query = $this->connection->getQueryBuilder();
+		$query
+			->update('share')
+			->set('accepted', $query->createNamedParameter(IShare::STATUS_ACCEPTED))
+			->where($query->expr()->in('share_type', $query->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_USERGROUP], IQueryBuilder::PARAM_INT_ARRAY)));
+		$query->execute();
+	}
+
+	protected function shouldRun() {
+		$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
+		return version_compare($appVersion, '1.10.1', '<');
+	}
+
+}

apps/files_sharing/lib/MountProvider.php

@@ -35,6 +35,7 @@
 use OCP\ILogger;
 use OCP\IUser;
 use OCP\Share\IManager;
+use OCP\Share\IShare;
 
 class MountProvider implements IMountProvider {
 	/**
@@ -94,6 +95,14 @@ public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
 			try {
 				/** @var \OCP\Share\IShare $parentShare */
 				$parentShare = $share[0];
+
+				if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED &&
+					($parentShare->getShareType() === IShare::TYPE_GROUP ||
+						$parentShare->getShareType() === IShare::TYPE_USERGROUP ||
+						$parentShare->getShareType() === IShare::TYPE_USER)) {
+					continue;
+				}
+
 				$owner = $parentShare->getShareOwner();
 				if (!isset($ownerViews[$owner])) {
 					$ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
@@ -184,12 +193,16 @@ private function buildSuperShares(array $allShares, \OCP\IUser $user) {
 			$superShare->setId($shares[0]->getId())
 				->setShareOwner($shares[0]->getShareOwner())
 				->setNodeId($shares[0]->getNodeId())
+				->setShareType($shares[0]->getShareType())
 				->setTarget($shares[0]->getTarget());
 
 			// use most permissive permissions
 			$permissions = 0;
+			$status = IShare::STATUS_PENDING;
 			foreach ($shares as $share) {
 				$permissions |= $share->getPermissions();
+				$status = max($status, $share->getStatus());
+
 				if ($share->getTarget() !== $superShare->getTarget()) {
 					// adjust target, for database consistency
 					$share->setTarget($superShare->getTarget());
@@ -216,7 +229,8 @@ private function buildSuperShares(array $allShares, \OCP\IUser $user) {
 				}
 			}
 
-			$superShare->setPermissions($permissions);
+			$superShare->setPermissions($permissions)
+				->setStatus($status);
 
 			$result[] = [$superShare, $shares];
 		}