nextcloud / server

apps/federatedfilesharing/lib/Controller/RequestHandlerController.php

Unused Use Statements -2 removed lines

@@ -29,7 +29,6 @@ 
 
 namespace OCA\FederatedFileSharing\Controller;
 
-use OCA\Files_Sharing\Activity\Providers\RemoteShares;
 use OCA\FederatedFileSharing\AddressHandler;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCA\FederatedFileSharing\Notifications;
@@ -39,7 +38,6 @@ 
 use OCP\AppFramework\OCS\OCSForbiddenException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
-use OCP\Constants;
 use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
 use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
 use OCP\Federation\Exceptions\ShareNotFoundException;

Indentation +468 added lines, -468 removed lines

@@ -56,472 +56,472 @@
 
 class RequestHandlerController extends OCSController {
 
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var Share\IManager */
-	private $shareManager;
-
-	/** @var Notifications */
-	private $notifications;
-
-	/** @var AddressHandler */
-	private $addressHandler;
-
-	/** @var  IUserManager */
-	private $userManager;
-
-	/** @var string */
-	private $shareTable = 'share';
-
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ICloudFederationFactory */
-	private $cloudFederationFactory;
-
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
-
-	/**
-	 * Server2Server constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param FederatedShareProvider $federatedShareProvider
-	 * @param IDBConnection $connection
-	 * @param Share\IManager $shareManager
-	 * @param Notifications $notifications
-	 * @param AddressHandler $addressHandler
-	 * @param IUserManager $userManager
-	 * @param ICloudIdManager $cloudIdManager
-	 * @param ILogger $logger
-	 * @param ICloudFederationFactory $cloudFederationFactory
-	 * @param ICloudFederationProviderManager $cloudFederationProviderManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								FederatedShareProvider $federatedShareProvider,
-								IDBConnection $connection,
-								Share\IManager $shareManager,
-								Notifications $notifications,
-								AddressHandler $addressHandler,
-								IUserManager $userManager,
-								ICloudIdManager $cloudIdManager,
-								ILogger $logger,
-								ICloudFederationFactory $cloudFederationFactory,
-								ICloudFederationProviderManager $cloudFederationProviderManager
-	) {
-		parent::__construct($appName, $request);
-
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->connection = $connection;
-		$this->shareManager = $shareManager;
-		$this->notifications = $notifications;
-		$this->addressHandler = $addressHandler;
-		$this->userManager = $userManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->logger = $logger;
-		$this->cloudFederationFactory = $cloudFederationFactory;
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * create a new share
-	 *
-	 * @return Http\DataResponse
-	 * @throws OCSException
-	 */
-	public function createShare() {
-
-		$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
-		$token = isset($_POST['token']) ? $_POST['token'] : null;
-		$name = isset($_POST['name']) ? $_POST['name'] : null;
-		$owner = isset($_POST['owner']) ? $_POST['owner'] : null;
-		$sharedBy = isset($_POST['sharedBy']) ? $_POST['sharedBy'] : null;
-		$shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : null;
-		$remoteId = isset($_POST['remoteId']) ? (int)$_POST['remoteId'] : null;
-		$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
-		$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
-
-		if ($ownerFederatedId === null) {
-			$ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
-		}
-		// if the owner of the share and the initiator are the same user
-		// we also complete the federated share ID for the initiator
-		if ($sharedByFederatedId === null && $owner === $sharedBy) {
-			$sharedByFederatedId = $ownerFederatedId;
-		}
-
-		$share = $this->cloudFederationFactory->getCloudFederationShare(
-			$shareWith,
-			$name,
-			'',
-			$remoteId,
-			$ownerFederatedId,
-			$owner,
-			$sharedByFederatedId,
-			$sharedBy,
-			$token,
-			'user',
-			'file'
-		);
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$provider->shareReceived($share);
-		} catch (ProviderDoesNotExistsException $e) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		} catch (ProviderCouldNotAddShareException $e) {
-			throw new OCSException($e->getMessage(), $e->getCode());
-		} catch (\Exception $e) {
-			throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
-		}
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * create re-share on behalf of another user
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 */
-	public function reShare($id) {
-
-		$token = $this->request->getParam('token', null);
-		$shareWith = $this->request->getParam('shareWith', null);
-		$permission = (int)$this->request->getParam('permission', null);
-		$remoteId = (int)$this->request->getParam('remoteId', null);
-
-		if ($id === null ||
-			$token === null ||
-			$shareWith === null ||
-			$permission === null ||
-			$remoteId === null
-		) {
-			throw new OCSBadRequestException();
-		}
-
-		$notification = [
-			'sharedSecret' => $token,
-			'shareWith' => $shareWith,
-			'senderId' => $remoteId,
-			'message' => 'Recipient of a share ask the owner to reshare the file'
-		];
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			list($newToken, $localId) = $provider->notificationReceived('REQUEST_RESHARE', $id, $notification);
-			return new Http\DataResponse([
-				'token' => $newToken,
-				'remoteId' => $localId
-			]);
-		} catch (ProviderDoesNotExistsException $e) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		} catch (ShareNotFoundException $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
-		} catch (ProviderCouldNotAddShareException $e) {
-			$this->logger->debug('Could not add reshare: ' . $e->getMessage());
-			throw new OCSForbiddenException();
-		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
-		}
-
-		throw new OCSBadRequestException();
-	}
-
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * accept server-to-server share
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSException
-	 * @throws Share\Exceptions\ShareNotFound
-	 * @throws \OC\HintException
-	 */
-	public function acceptShare($id) {
-
-		$token = isset($_POST['token']) ? $_POST['token'] : null;
-
-		$notification = [
-			'sharedSecret' => $token,
-			'message' => 'Recipient accept the share'
-		];
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$provider->notificationReceived('SHARE_ACCEPTED', $id, $notification);
-		} catch (ProviderDoesNotExistsException $e) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		} catch (ShareNotFoundException $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
-		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
-		}
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * decline server-to-server share
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSException
-	 */
-	public function declineShare($id) {
-
-		$token = isset($_POST['token']) ? $_POST['token'] : null;
-
-		$notification = [
-			'sharedSecret' => $token,
-			'message' => 'Recipient declined the share'
-		];
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$provider->notificationReceived('SHARE_DECLINED', $id, $notification);
-		} catch (ProviderDoesNotExistsException $e) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		} catch (ShareNotFoundException $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
-		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
-		}
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * remove server-to-server share if it was unshared by the owner
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSException
-	 */
-	public function unshare($id) {
-
-		if (!$this->isS2SEnabled()) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		}
-
-		$token = isset($_POST['token']) ? $_POST['token'] : null;
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$notification = ['sharedSecret' => $token];
-			$provider->notificationReceived('SHARE_UNSHARED', $id, $notification);
-		} catch (\Exception $e) {
-			$this->logger->debug('processing unshare notification failed: ' . $e->getMessage());
-		}
-
-		return new Http\DataResponse();
-	}
-
-	private function cleanupRemote($remote) {
-		$remote = substr($remote, strpos($remote, '://') + 3);
-
-		return rtrim($remote, '/');
-	}
-
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * federated share was revoked, either by the owner or the re-sharer
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function revoke($id) {
-
-		$token = $this->request->getParam('token');
-
-		$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-		$notification->setMessage(['sharedSecret' => $token]);
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$provider->notificationReceived('SHARE_UNSHARE', $id, $notification);
-			return new Http\DataResponse();
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException();
-		}
-
-	}
-
-	/**
-	 * get share
-	 *
-	 * @param int $id
-	 * @param string $token
-	 * @return array|bool
-	 */
-	protected function getShare($id, $token) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from($this->shareTable)
-			->where($query->expr()->eq('token', $query->createNamedParameter($token)))
-			->andWhere($query->expr()->eq('share_type', $query->createNamedParameter(FederatedShareProvider::SHARE_TYPE_REMOTE)))
-			->andWhere($query->expr()->eq('id', $query->createNamedParameter($id)));
-
-		$result = $query->execute()->fetchAll();
-
-		if (!empty($result) && isset($result[0])) {
-			return $result[0];
-		}
-
-		return false;
-	}
-
-	/**
-	 * get file
-	 *
-	 * @param string $user
-	 * @param int $fileSource
-	 * @return array with internal path of the file and a absolute link to it
-	 */
-	private function getFile($user, $fileSource) {
-		\OC_Util::setupFS($user);
-
-		try {
-			$file = \OC\Files\Filesystem::getPath($fileSource);
-		} catch (NotFoundException $e) {
-			$file = null;
-		}
-		$args = \OC\Files\Filesystem::is_dir($file) ? array('dir' => $file) : array('dir' => dirname($file), 'scrollto' => $file);
-		$link = \OCP\Util::linkToAbsolute('files', 'index.php', $args);
-
-		return array($file, $link);
-
-	}
-
-	/**
-	 * check if server-to-server sharing is enabled
-	 *
-	 * @param bool $incoming
-	 * @return bool
-	 */
-	private function isS2SEnabled($incoming = false) {
-
-		$result = \OCP\App::isEnabled('files_sharing');
-
-		if ($incoming) {
-			$result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled();
-		} else {
-			$result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * update share information to keep federated re-shares in sync
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function updatePermissions($id) {
-		$token = $this->request->getParam('token', null);
-		$permissions = $this->request->getParam('permissions', null);
-
-		try {
-			$share = $this->federatedShareProvider->getShareById($id);
-		} catch (Share\Exceptions\ShareNotFound $e) {
-			throw new OCSBadRequestException();
-		}
-
-		$validPermission = ctype_digit($permissions);
-		$validToken = $this->verifyShare($share, $token);
-		if ($validPermission && $validToken) {
-			$this->updatePermissionsInDatabase($share, (int)$permissions);
-		} else {
-			throw new OCSBadRequestException();
-		}
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * update permissions in database
-	 *
-	 * @param IShare $share
-	 * @param int $permissions
-	 */
-	protected function updatePermissionsInDatabase(IShare $share, $permissions) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('share')
-			->where($query->expr()->eq('id', $query->createNamedParameter($share->getId())))
-			->set('permissions', $query->createNamedParameter($permissions))
-			->execute();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * change the owner of a server-to-server share
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws \InvalidArgumentException
-	 * @throws OCSException
-	 */
-	public function move($id) {
-
-		if (!$this->isS2SEnabled()) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		}
-
-		$token = $this->request->getParam('token');
-		$remote = $this->request->getParam('remote');
-		$newRemoteId = $this->request->getParam('remote_id', $id);
-		$cloudId = $this->cloudIdManager->resolveCloudId($remote);
-
-		$qb = $this->connection->getQueryBuilder();
-		$query = $qb->update('share_external')
-			->set('remote', $qb->createNamedParameter($cloudId->getRemote()))
-			->set('owner', $qb->createNamedParameter($cloudId->getUser()))
-			->set('remote_id', $qb->createNamedParameter($newRemoteId))
-			->where($qb->expr()->eq('remote_id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('share_token', $qb->createNamedParameter($token)));
-		$affected = $query->execute();
-
-		if ($affected > 0) {
-			return new Http\DataResponse(['remote' => $cloudId->getRemote(), 'owner' => $cloudId->getUser()]);
-		} else {
-			throw new OCSBadRequestException('Share not found or token invalid');
-		}
-	}
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var Share\IManager */
+    private $shareManager;
+
+    /** @var Notifications */
+    private $notifications;
+
+    /** @var AddressHandler */
+    private $addressHandler;
+
+    /** @var  IUserManager */
+    private $userManager;
+
+    /** @var string */
+    private $shareTable = 'share';
+
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ICloudFederationFactory */
+    private $cloudFederationFactory;
+
+    /** @var ICloudFederationProviderManager */
+    private $cloudFederationProviderManager;
+
+    /**
+     * Server2Server constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param FederatedShareProvider $federatedShareProvider
+     * @param IDBConnection $connection
+     * @param Share\IManager $shareManager
+     * @param Notifications $notifications
+     * @param AddressHandler $addressHandler
+     * @param IUserManager $userManager
+     * @param ICloudIdManager $cloudIdManager
+     * @param ILogger $logger
+     * @param ICloudFederationFactory $cloudFederationFactory
+     * @param ICloudFederationProviderManager $cloudFederationProviderManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                FederatedShareProvider $federatedShareProvider,
+                                IDBConnection $connection,
+                                Share\IManager $shareManager,
+                                Notifications $notifications,
+                                AddressHandler $addressHandler,
+                                IUserManager $userManager,
+                                ICloudIdManager $cloudIdManager,
+                                ILogger $logger,
+                                ICloudFederationFactory $cloudFederationFactory,
+                                ICloudFederationProviderManager $cloudFederationProviderManager
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->connection = $connection;
+        $this->shareManager = $shareManager;
+        $this->notifications = $notifications;
+        $this->addressHandler = $addressHandler;
+        $this->userManager = $userManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->logger = $logger;
+        $this->cloudFederationFactory = $cloudFederationFactory;
+        $this->cloudFederationProviderManager = $cloudFederationProviderManager;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * create a new share
+     *
+     * @return Http\DataResponse
+     * @throws OCSException
+     */
+    public function createShare() {
+
+        $remote = isset($_POST['remote']) ? $_POST['remote'] : null;
+        $token = isset($_POST['token']) ? $_POST['token'] : null;
+        $name = isset($_POST['name']) ? $_POST['name'] : null;
+        $owner = isset($_POST['owner']) ? $_POST['owner'] : null;
+        $sharedBy = isset($_POST['sharedBy']) ? $_POST['sharedBy'] : null;
+        $shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : null;
+        $remoteId = isset($_POST['remoteId']) ? (int)$_POST['remoteId'] : null;
+        $sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
+        $ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
+
+        if ($ownerFederatedId === null) {
+            $ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
+        }
+        // if the owner of the share and the initiator are the same user
+        // we also complete the federated share ID for the initiator
+        if ($sharedByFederatedId === null && $owner === $sharedBy) {
+            $sharedByFederatedId = $ownerFederatedId;
+        }
+
+        $share = $this->cloudFederationFactory->getCloudFederationShare(
+            $shareWith,
+            $name,
+            '',
+            $remoteId,
+            $ownerFederatedId,
+            $owner,
+            $sharedByFederatedId,
+            $sharedBy,
+            $token,
+            'user',
+            'file'
+        );
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $provider->shareReceived($share);
+        } catch (ProviderDoesNotExistsException $e) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        } catch (ProviderCouldNotAddShareException $e) {
+            throw new OCSException($e->getMessage(), $e->getCode());
+        } catch (\Exception $e) {
+            throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
+        }
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * create re-share on behalf of another user
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     */
+    public function reShare($id) {
+
+        $token = $this->request->getParam('token', null);
+        $shareWith = $this->request->getParam('shareWith', null);
+        $permission = (int)$this->request->getParam('permission', null);
+        $remoteId = (int)$this->request->getParam('remoteId', null);
+
+        if ($id === null ||
+            $token === null ||
+            $shareWith === null ||
+            $permission === null ||
+            $remoteId === null
+        ) {
+            throw new OCSBadRequestException();
+        }
+
+        $notification = [
+            'sharedSecret' => $token,
+            'shareWith' => $shareWith,
+            'senderId' => $remoteId,
+            'message' => 'Recipient of a share ask the owner to reshare the file'
+        ];
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            list($newToken, $localId) = $provider->notificationReceived('REQUEST_RESHARE', $id, $notification);
+            return new Http\DataResponse([
+                'token' => $newToken,
+                'remoteId' => $localId
+            ]);
+        } catch (ProviderDoesNotExistsException $e) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        } catch (ShareNotFoundException $e) {
+            $this->logger->debug('Share not found: ' . $e->getMessage());
+        } catch (ProviderCouldNotAddShareException $e) {
+            $this->logger->debug('Could not add reshare: ' . $e->getMessage());
+            throw new OCSForbiddenException();
+        } catch (\Exception $e) {
+            $this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+        }
+
+        throw new OCSBadRequestException();
+    }
+
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * accept server-to-server share
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSException
+     * @throws Share\Exceptions\ShareNotFound
+     * @throws \OC\HintException
+     */
+    public function acceptShare($id) {
+
+        $token = isset($_POST['token']) ? $_POST['token'] : null;
+
+        $notification = [
+            'sharedSecret' => $token,
+            'message' => 'Recipient accept the share'
+        ];
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $provider->notificationReceived('SHARE_ACCEPTED', $id, $notification);
+        } catch (ProviderDoesNotExistsException $e) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        } catch (ShareNotFoundException $e) {
+            $this->logger->debug('Share not found: ' . $e->getMessage());
+        } catch (\Exception $e) {
+            $this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+        }
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * decline server-to-server share
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSException
+     */
+    public function declineShare($id) {
+
+        $token = isset($_POST['token']) ? $_POST['token'] : null;
+
+        $notification = [
+            'sharedSecret' => $token,
+            'message' => 'Recipient declined the share'
+        ];
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $provider->notificationReceived('SHARE_DECLINED', $id, $notification);
+        } catch (ProviderDoesNotExistsException $e) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        } catch (ShareNotFoundException $e) {
+            $this->logger->debug('Share not found: ' . $e->getMessage());
+        } catch (\Exception $e) {
+            $this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+        }
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * remove server-to-server share if it was unshared by the owner
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSException
+     */
+    public function unshare($id) {
+
+        if (!$this->isS2SEnabled()) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        }
+
+        $token = isset($_POST['token']) ? $_POST['token'] : null;
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $notification = ['sharedSecret' => $token];
+            $provider->notificationReceived('SHARE_UNSHARED', $id, $notification);
+        } catch (\Exception $e) {
+            $this->logger->debug('processing unshare notification failed: ' . $e->getMessage());
+        }
+
+        return new Http\DataResponse();
+    }
+
+    private function cleanupRemote($remote) {
+        $remote = substr($remote, strpos($remote, '://') + 3);
+
+        return rtrim($remote, '/');
+    }
+
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * federated share was revoked, either by the owner or the re-sharer
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function revoke($id) {
+
+        $token = $this->request->getParam('token');
+
+        $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+        $notification->setMessage(['sharedSecret' => $token]);
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $provider->notificationReceived('SHARE_UNSHARE', $id, $notification);
+            return new Http\DataResponse();
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException();
+        }
+
+    }
+
+    /**
+     * get share
+     *
+     * @param int $id
+     * @param string $token
+     * @return array|bool
+     */
+    protected function getShare($id, $token) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from($this->shareTable)
+            ->where($query->expr()->eq('token', $query->createNamedParameter($token)))
+            ->andWhere($query->expr()->eq('share_type', $query->createNamedParameter(FederatedShareProvider::SHARE_TYPE_REMOTE)))
+            ->andWhere($query->expr()->eq('id', $query->createNamedParameter($id)));
+
+        $result = $query->execute()->fetchAll();
+
+        if (!empty($result) && isset($result[0])) {
+            return $result[0];
+        }
+
+        return false;
+    }
+
+    /**
+     * get file
+     *
+     * @param string $user
+     * @param int $fileSource
+     * @return array with internal path of the file and a absolute link to it
+     */
+    private function getFile($user, $fileSource) {
+        \OC_Util::setupFS($user);
+
+        try {
+            $file = \OC\Files\Filesystem::getPath($fileSource);
+        } catch (NotFoundException $e) {
+            $file = null;
+        }
+        $args = \OC\Files\Filesystem::is_dir($file) ? array('dir' => $file) : array('dir' => dirname($file), 'scrollto' => $file);
+        $link = \OCP\Util::linkToAbsolute('files', 'index.php', $args);
+
+        return array($file, $link);
+
+    }
+
+    /**
+     * check if server-to-server sharing is enabled
+     *
+     * @param bool $incoming
+     * @return bool
+     */
+    private function isS2SEnabled($incoming = false) {
+
+        $result = \OCP\App::isEnabled('files_sharing');
+
+        if ($incoming) {
+            $result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled();
+        } else {
+            $result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        }
+
+        return $result;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * update share information to keep federated re-shares in sync
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function updatePermissions($id) {
+        $token = $this->request->getParam('token', null);
+        $permissions = $this->request->getParam('permissions', null);
+
+        try {
+            $share = $this->federatedShareProvider->getShareById($id);
+        } catch (Share\Exceptions\ShareNotFound $e) {
+            throw new OCSBadRequestException();
+        }
+
+        $validPermission = ctype_digit($permissions);
+        $validToken = $this->verifyShare($share, $token);
+        if ($validPermission && $validToken) {
+            $this->updatePermissionsInDatabase($share, (int)$permissions);
+        } else {
+            throw new OCSBadRequestException();
+        }
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * update permissions in database
+     *
+     * @param IShare $share
+     * @param int $permissions
+     */
+    protected function updatePermissionsInDatabase(IShare $share, $permissions) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('share')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($share->getId())))
+            ->set('permissions', $query->createNamedParameter($permissions))
+            ->execute();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * change the owner of a server-to-server share
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws \InvalidArgumentException
+     * @throws OCSException
+     */
+    public function move($id) {
+
+        if (!$this->isS2SEnabled()) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        }
+
+        $token = $this->request->getParam('token');
+        $remote = $this->request->getParam('remote');
+        $newRemoteId = $this->request->getParam('remote_id', $id);
+        $cloudId = $this->cloudIdManager->resolveCloudId($remote);
+
+        $qb = $this->connection->getQueryBuilder();
+        $query = $qb->update('share_external')
+            ->set('remote', $qb->createNamedParameter($cloudId->getRemote()))
+            ->set('owner', $qb->createNamedParameter($cloudId->getUser()))
+            ->set('remote_id', $qb->createNamedParameter($newRemoteId))
+            ->where($qb->expr()->eq('remote_id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('share_token', $qb->createNamedParameter($token)));
+        $affected = $query->execute();
+
+        if ($affected > 0) {
+            return new Http\DataResponse(['remote' => $cloudId->getRemote(), 'owner' => $cloudId->getUser()]);
+        } else {
+            throw new OCSBadRequestException('Share not found or token invalid');
+        }
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -149,7 +149,7 @@ 
 		$owner = isset($_POST['owner']) ? $_POST['owner'] : null;
 		$sharedBy = isset($_POST['sharedBy']) ? $_POST['sharedBy'] : null;
 		$shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : null;
-		$remoteId = isset($_POST['remoteId']) ? (int)$_POST['remoteId'] : null;
+		$remoteId = isset($_POST['remoteId']) ? (int) $_POST['remoteId'] : null;
 		$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
 		$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
 
@@ -184,7 +184,7 @@ 
 		} catch (ProviderCouldNotAddShareException $e) {
 			throw new OCSException($e->getMessage(), $e->getCode());
 		} catch (\Exception $e) {
-			throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
+			throw new OCSException('internal server error, was not able to add share from '.$remote, 500);
 		}
 
 		return new Http\DataResponse();
@@ -206,8 +206,8 @@ 
 
 		$token = $this->request->getParam('token', null);
 		$shareWith = $this->request->getParam('shareWith', null);
-		$permission = (int)$this->request->getParam('permission', null);
-		$remoteId = (int)$this->request->getParam('remoteId', null);
+		$permission = (int) $this->request->getParam('permission', null);
+		$remoteId = (int) $this->request->getParam('remoteId', null);
 
 		if ($id === null ||
 			$token === null ||
@@ -235,12 +235,12 @@ 
 		} catch (ProviderDoesNotExistsException $e) {
 			throw new OCSException('Server does not support federated cloud sharing', 503);
 		} catch (ShareNotFoundException $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
+			$this->logger->debug('Share not found: '.$e->getMessage());
 		} catch (ProviderCouldNotAddShareException $e) {
-			$this->logger->debug('Could not add reshare: ' . $e->getMessage());
+			$this->logger->debug('Could not add reshare: '.$e->getMessage());
 			throw new OCSForbiddenException();
 		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+			$this->logger->debug('internal server error, can not process notification: '.$e->getMessage());
 		}
 
 		throw new OCSBadRequestException();
@@ -274,9 +274,9 @@ 
 		} catch (ProviderDoesNotExistsException $e) {
 			throw new OCSException('Server does not support federated cloud sharing', 503);
 		} catch (ShareNotFoundException $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
+			$this->logger->debug('Share not found: '.$e->getMessage());
 		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+			$this->logger->debug('internal server error, can not process notification: '.$e->getMessage());
 		}
 
 		return new Http\DataResponse();
@@ -307,9 +307,9 @@ 
 		} catch (ProviderDoesNotExistsException $e) {
 			throw new OCSException('Server does not support federated cloud sharing', 503);
 		} catch (ShareNotFoundException $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
+			$this->logger->debug('Share not found: '.$e->getMessage());
 		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+			$this->logger->debug('internal server error, can not process notification: '.$e->getMessage());
 		}
 
 		return new Http\DataResponse();
@@ -338,7 +338,7 @@ 
 			$notification = ['sharedSecret' => $token];
 			$provider->notificationReceived('SHARE_UNSHARED', $id, $notification);
 		} catch (\Exception $e) {
-			$this->logger->debug('processing unshare notification failed: ' . $e->getMessage());
+			$this->logger->debug('processing unshare notification failed: '.$e->getMessage());
 		}
 
 		return new Http\DataResponse();
@@ -465,7 +465,7 @@ 
 		$validPermission = ctype_digit($permissions);
 		$validToken = $this->verifyShare($share, $token);
 		if ($validPermission && $validToken) {
-			$this->updatePermissionsInDatabase($share, (int)$permissions);
+			$this->updatePermissionsInDatabase($share, (int) $permissions);
 		} else {
 			throw new OCSBadRequestException();
 		}

apps/federatedfilesharing/lib/Notifications.php

Doc Comments +7 added lines, -7 removed lines

@@ -184,7 +184,7 @@ 
 	 * @param string $remote url
 	 * @param int $id share id
 	 * @param string $token
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function sendRemoteUnShare($remote, $id, $token) {
 		$this->sendUpdateToRemote($remote, $id, $token, 'unshare');
@@ -196,7 +196,7 @@ 
 	 * @param string $remote url
 	 * @param int $id share id
 	 * @param string $token
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function sendRevokeShare($remote, $id, $token) {
 		$this->sendUpdateToRemote($remote, $id, $token, 'reshare_undo');
@@ -209,7 +209,7 @@ 
 	 * @param int $remoteId
 	 * @param string $token
 	 * @param int $permissions
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
 		$this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
@@ -330,8 +330,8 @@ 
 	/**
 	 * try old federated sharing API if the OCM api doesn't work
 	 *
-	 * @param $remoteDomain
-	 * @param $urlSuffix
+	 * @param string $remoteDomain
+	 * @param string $urlSuffix
 	 * @param array $fields
 	 * @return mixed
 	 * @throws \Exception
@@ -395,9 +395,9 @@ 
 	/**
 	 * send action regarding federated sharing to the remote server using the OCM API
 	 *
-	 * @param $remoteDomain
+	 * @param string $remoteDomain
 	 * @param $fields
-	 * @param $action
+	 * @param string $action
 	 *
 	 * @return bool
 	 */

Indentation +416 added lines, -416 removed lines

@@ -33,420 +33,420 @@
 use OCP\OCS\IDiscoveryService;
 
 class Notifications {
-	const RESPONSE_FORMAT = 'json'; // default response format for ocs calls
-
-	/** @var AddressHandler */
-	private $addressHandler;
-
-	/** @var IClientService */
-	private $httpClientService;
-
-	/** @var IDiscoveryService */
-	private $discoveryService;
-
-	/** @var IJobList  */
-	private $jobList;
-
-	/** @var ICloudFederationProviderManager */
-	private $federationProviderManager;
-
-	/** @var ICloudFederationFactory */
-	private $cloudFederationFactory;
-
-	/**
-	 * @param AddressHandler $addressHandler
-	 * @param IClientService $httpClientService
-	 * @param IDiscoveryService $discoveryService
-	 * @param IJobList $jobList
-	 * @param ICloudFederationProviderManager $federationProviderManager
-	 * @param ICloudFederationFactory $cloudFederationFactory
-	 */
-	public function __construct(
-		AddressHandler $addressHandler,
-		IClientService $httpClientService,
-		IDiscoveryService $discoveryService,
-		IJobList $jobList,
-		ICloudFederationProviderManager $federationProviderManager,
-		ICloudFederationFactory $cloudFederationFactory
-	) {
-		$this->addressHandler = $addressHandler;
-		$this->httpClientService = $httpClientService;
-		$this->discoveryService = $discoveryService;
-		$this->jobList = $jobList;
-		$this->federationProviderManager = $federationProviderManager;
-		$this->cloudFederationFactory = $cloudFederationFactory;
-	}
-
-	/**
-	 * send server-to-server share to remote server
-	 *
-	 * @param string $token
-	 * @param string $shareWith
-	 * @param string $name
-	 * @param int $remote_id
-	 * @param string $owner
-	 * @param string $ownerFederatedId
-	 * @param string $sharedBy
-	 * @param string $sharedByFederatedId
-	 * @return bool
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function sendRemoteShare($token, $shareWith, $name, $remote_id, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId) {
-
-		list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
-
-		if ($user && $remote) {
-			$local = $this->addressHandler->generateRemoteURL();
-
-			$fields = array(
-				'shareWith' => $user,
-				'token' => $token,
-				'name' => $name,
-				'remoteId' => $remote_id,
-				'owner' => $owner,
-				'ownerFederatedId' => $ownerFederatedId,
-				'sharedBy' => $sharedBy,
-				'sharedByFederatedId' => $sharedByFederatedId,
-				'remote' => $local,
-			);
-
-			$result = $this->tryHttpPostToShareEndpoint($remote, '', $fields);
-			$status = json_decode($result['result'], true);
-
-			$ocsStatus = isset($status['ocs']);
-			$ocsSuccess = $ocsStatus && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
-
-			if ($result['success'] && (!$ocsStatus ||$ocsSuccess)) {
-				\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
-				return true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * ask owner to re-share the file with the given user
-	 *
-	 * @param string $token
-	 * @param int $id remote Id
-	 * @param int $shareId internal share Id
-	 * @param string $remote remote address of the owner
-	 * @param string $shareWith
-	 * @param int $permission
-	 * @param string $filename
-	 * @return bool
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission, $filename) {
-
-		$fields = array(
-			'shareWith' => $shareWith,
-			'token' => $token,
-			'permission' => $permission,
-			'remoteId' => $shareId,
-		);
-
-		$ocmFields = $fields;
-		$ocmFields['remoteId'] = $id;
-		$ocmFields['localId'] = $shareId;
-		$ocmFields['name'] = $filename;
-
-		$ocmResult = $this->tryOCMEndPoint($remote, $ocmFields, 'reshare');
-		if (is_array($ocmResult) && isset($ocmResult['token']) && isset($ocmResult['providerId'])) {
-			return [$ocmResult['token'], $ocmResult['providerId']];
-		}
-
-		$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
-		$status = json_decode($result['result'], true);
-
-		$httpRequestSuccessful = $result['success'];
-		$ocsCallSuccessful = $status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200;
-		$validToken = isset($status['ocs']['data']['token']) && is_string($status['ocs']['data']['token']);
-		$validRemoteId = isset($status['ocs']['data']['remoteId']);
-
-		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
-			return [
-				$status['ocs']['data']['token'],
-				(int)$status['ocs']['data']['remoteId']
-			];
-		}
-
-		return false;
-	}
-
-	/**
-	 * send server-to-server unshare to remote server
-	 *
-	 * @param string $remote url
-	 * @param int $id share id
-	 * @param string $token
-	 * @return bool
-	 */
-	public function sendRemoteUnShare($remote, $id, $token) {
-		$this->sendUpdateToRemote($remote, $id, $token, 'unshare');
-	}
-
-	/**
-	 * send server-to-server unshare to remote server
-	 *
-	 * @param string $remote url
-	 * @param int $id share id
-	 * @param string $token
-	 * @return bool
-	 */
-	public function sendRevokeShare($remote, $id, $token) {
-		$this->sendUpdateToRemote($remote, $id, $token, 'reshare_undo');
-	}
-
-	/**
-	 * send notification to remote server if the permissions was changed
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 * @param int $permissions
-	 * @return bool
-	 */
-	public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
-	}
-
-	/**
-	 * forward accept reShare to remote server
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 */
-	public function sendAcceptShare($remote, $remoteId, $token) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'accept');
-	}
-
-	/**
-	 * forward decline reShare to remote server
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 */
-	public function sendDeclineShare($remote, $remoteId, $token) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'decline');
-	}
-
-	/**
-	 * inform remote server whether server-to-server share was accepted/declined
-	 *
-	 * @param string $remote
-	 * @param string $token
-	 * @param int $remoteId Share id on the remote host
-	 * @param string $action possible actions: accept, decline, unshare, revoke, permissions
-	 * @param array $data
-	 * @param int $try
-	 * @return boolean
-	 */
-	public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data = [], $try = 0) {
-
-		$fields = [
-			'token' => $token,
-			'remoteId' => $remoteId
-			];
-		foreach ($data as $key => $value) {
-			$fields[$key] = $value;
-		}
-
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields, $action);
-		$status = json_decode($result['result'], true);
-
-		if ($result['success'] &&
-			($status['ocs']['meta']['statuscode'] === 100 ||
-				$status['ocs']['meta']['statuscode'] === 200
-			)
-		) {
-			return true;
-		} elseif ($try === 0) {
-			// only add new job on first try
-			$this->jobList->add('OCA\FederatedFileSharing\BackgroundJob\RetryJob',
-				[
-					'remote' => $remote,
-					'remoteId' => $remoteId,
-					'token' => $token,
-					'action' => $action,
-					'data' => json_encode($data),
-					'try' => $try,
-					'lastRun' => $this->getTimestamp()
-				]
-			);
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * return current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getTimestamp() {
-		return time();
-	}
-
-	/**
-	 * try http post with the given protocol, if no protocol is given we pick
-	 * the secure one (https)
-	 *
-	 * @param string $remoteDomain
-	 * @param string $urlSuffix
-	 * @param array $fields post parameters
-	 * @param string $action define the action (possible values: share, reshare, accept, decline, unshare, revoke, permissions)
-	 * @return array
-	 * @throws \Exception
-	 */
-	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action="share") {
-
-		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
-			$remoteDomain = 'https://' . $remoteDomain;
-		}
-
-		$result = [
-			'success' => false,
-			'result' => '',
-		];
-
-		// if possible we use the new OCM API
-		$ocmResult = $this->tryOCMEndPoint($remoteDomain, $fields, $action);
-		if ($ocmResult) {
-			$result['success'] = true;
-			return $result;
-		}
-
-		return $this->tryLegacyEndPoint($remoteDomain, $urlSuffix, $fields);
-	}
-
-	/**
-	 * try old federated sharing API if the OCM api doesn't work
-	 *
-	 * @param $remoteDomain
-	 * @param $urlSuffix
-	 * @param array $fields
-	 * @return mixed
-	 * @throws \Exception
-	 */
-	protected function tryLegacyEndPoint($remoteDomain, $urlSuffix, array $fields) {
-
-		$result = [
-			'success' => false,
-			'result' => '',
-		];
-
-		// Fall back to old API
-		$client = $this->httpClientService->newClient();
-		$federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
-		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
-		try {
-			$response = $client->post($remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT, [
-				'body' => $fields,
-				'timeout' => 10,
-				'connect_timeout' => 10,
-			]);
-			$result['result'] = $response->getBody();
-			$result['success'] = true;
-		} catch (\Exception $e) {
-			// if flat re-sharing is not supported by the remote server
-			// we re-throw the exception and fall back to the old behaviour.
-			// (flat re-shares has been introduced in Nextcloud 9.1)
-			if ($e->getCode() === Http::STATUS_INTERNAL_SERVER_ERROR) {
-				throw $e;
-			}
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * check if server supports the new OCM api and ask for the correct end-point
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function getOCMEndPoint($url) {
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get($url, ['timeout' => 10, 'connect_timeout' => 10]);
-		} catch (\Exception $e) {
-			return '';
-		}
-
-		$result = $response->getBody();
-		$result = json_decode($result, true);
-
-		if (isset($result['end-point'])) {
-			return $result['end-point'];
-		}
-
-		return '';
-	}
-
-	/**
-	 * send action regarding federated sharing to the remote server using the OCM API
-	 *
-	 * @param $remoteDomain
-	 * @param $fields
-	 * @param $action
-	 *
-	 * @return bool
-	 */
-	protected function tryOCMEndPoint($remoteDomain, $fields, $action) {
-		switch ($action) {
-			case 'share':
-				$share = $this->cloudFederationFactory->getCloudFederationShare(
-					$fields['shareWith'] . '@' . $remoteDomain,
-					$fields['name'],
-					'',
-					$fields['remoteId'],
-					$fields['ownerFederatedId'],
-					$fields['owner'],
-					$fields['sharedByFederatedId'],
-					$fields['sharedBy'],
-					$fields['token'],
-					'user',
-					'file'
-				);
-				return $this->federationProviderManager->sendShare($share);
-			case 'reshare':
-				// ask owner to reshare a file
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage('REQUEST_RESHARE',
-					'file',
-					$fields['remoteId'],
-					[
-						'sharedSecret' => $fields['token'],
-						'shareWith' => $fields['shareWith'],
-						'senderId' => $fields['localId'],
-						'message' => 'Ask owner to reshare the file'
-					]
-				);
-				return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
-			case 'unshare':
-				//owner unshares the file from the recipient again
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage('SHARE_UNSHARED',
-					'file',
-					$fields['remoteId'],
-					[
-						'sharedSecret' => $fields['token'],
-					]
-				);
-				return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
-				return false;
-		}
-
-		return false;
-
-	}
+    const RESPONSE_FORMAT = 'json'; // default response format for ocs calls
+
+    /** @var AddressHandler */
+    private $addressHandler;
+
+    /** @var IClientService */
+    private $httpClientService;
+
+    /** @var IDiscoveryService */
+    private $discoveryService;
+
+    /** @var IJobList  */
+    private $jobList;
+
+    /** @var ICloudFederationProviderManager */
+    private $federationProviderManager;
+
+    /** @var ICloudFederationFactory */
+    private $cloudFederationFactory;
+
+    /**
+     * @param AddressHandler $addressHandler
+     * @param IClientService $httpClientService
+     * @param IDiscoveryService $discoveryService
+     * @param IJobList $jobList
+     * @param ICloudFederationProviderManager $federationProviderManager
+     * @param ICloudFederationFactory $cloudFederationFactory
+     */
+    public function __construct(
+        AddressHandler $addressHandler,
+        IClientService $httpClientService,
+        IDiscoveryService $discoveryService,
+        IJobList $jobList,
+        ICloudFederationProviderManager $federationProviderManager,
+        ICloudFederationFactory $cloudFederationFactory
+    ) {
+        $this->addressHandler = $addressHandler;
+        $this->httpClientService = $httpClientService;
+        $this->discoveryService = $discoveryService;
+        $this->jobList = $jobList;
+        $this->federationProviderManager = $federationProviderManager;
+        $this->cloudFederationFactory = $cloudFederationFactory;
+    }
+
+    /**
+     * send server-to-server share to remote server
+     *
+     * @param string $token
+     * @param string $shareWith
+     * @param string $name
+     * @param int $remote_id
+     * @param string $owner
+     * @param string $ownerFederatedId
+     * @param string $sharedBy
+     * @param string $sharedByFederatedId
+     * @return bool
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function sendRemoteShare($token, $shareWith, $name, $remote_id, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId) {
+
+        list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
+
+        if ($user && $remote) {
+            $local = $this->addressHandler->generateRemoteURL();
+
+            $fields = array(
+                'shareWith' => $user,
+                'token' => $token,
+                'name' => $name,
+                'remoteId' => $remote_id,
+                'owner' => $owner,
+                'ownerFederatedId' => $ownerFederatedId,
+                'sharedBy' => $sharedBy,
+                'sharedByFederatedId' => $sharedByFederatedId,
+                'remote' => $local,
+            );
+
+            $result = $this->tryHttpPostToShareEndpoint($remote, '', $fields);
+            $status = json_decode($result['result'], true);
+
+            $ocsStatus = isset($status['ocs']);
+            $ocsSuccess = $ocsStatus && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
+
+            if ($result['success'] && (!$ocsStatus ||$ocsSuccess)) {
+                \OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * ask owner to re-share the file with the given user
+     *
+     * @param string $token
+     * @param int $id remote Id
+     * @param int $shareId internal share Id
+     * @param string $remote remote address of the owner
+     * @param string $shareWith
+     * @param int $permission
+     * @param string $filename
+     * @return bool
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission, $filename) {
+
+        $fields = array(
+            'shareWith' => $shareWith,
+            'token' => $token,
+            'permission' => $permission,
+            'remoteId' => $shareId,
+        );
+
+        $ocmFields = $fields;
+        $ocmFields['remoteId'] = $id;
+        $ocmFields['localId'] = $shareId;
+        $ocmFields['name'] = $filename;
+
+        $ocmResult = $this->tryOCMEndPoint($remote, $ocmFields, 'reshare');
+        if (is_array($ocmResult) && isset($ocmResult['token']) && isset($ocmResult['providerId'])) {
+            return [$ocmResult['token'], $ocmResult['providerId']];
+        }
+
+        $result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
+        $status = json_decode($result['result'], true);
+
+        $httpRequestSuccessful = $result['success'];
+        $ocsCallSuccessful = $status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200;
+        $validToken = isset($status['ocs']['data']['token']) && is_string($status['ocs']['data']['token']);
+        $validRemoteId = isset($status['ocs']['data']['remoteId']);
+
+        if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
+            return [
+                $status['ocs']['data']['token'],
+                (int)$status['ocs']['data']['remoteId']
+            ];
+        }
+
+        return false;
+    }
+
+    /**
+     * send server-to-server unshare to remote server
+     *
+     * @param string $remote url
+     * @param int $id share id
+     * @param string $token
+     * @return bool
+     */
+    public function sendRemoteUnShare($remote, $id, $token) {
+        $this->sendUpdateToRemote($remote, $id, $token, 'unshare');
+    }
+
+    /**
+     * send server-to-server unshare to remote server
+     *
+     * @param string $remote url
+     * @param int $id share id
+     * @param string $token
+     * @return bool
+     */
+    public function sendRevokeShare($remote, $id, $token) {
+        $this->sendUpdateToRemote($remote, $id, $token, 'reshare_undo');
+    }
+
+    /**
+     * send notification to remote server if the permissions was changed
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     * @param int $permissions
+     * @return bool
+     */
+    public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
+    }
+
+    /**
+     * forward accept reShare to remote server
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     */
+    public function sendAcceptShare($remote, $remoteId, $token) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'accept');
+    }
+
+    /**
+     * forward decline reShare to remote server
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     */
+    public function sendDeclineShare($remote, $remoteId, $token) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'decline');
+    }
+
+    /**
+     * inform remote server whether server-to-server share was accepted/declined
+     *
+     * @param string $remote
+     * @param string $token
+     * @param int $remoteId Share id on the remote host
+     * @param string $action possible actions: accept, decline, unshare, revoke, permissions
+     * @param array $data
+     * @param int $try
+     * @return boolean
+     */
+    public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data = [], $try = 0) {
+
+        $fields = [
+            'token' => $token,
+            'remoteId' => $remoteId
+            ];
+        foreach ($data as $key => $value) {
+            $fields[$key] = $value;
+        }
+
+        $result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields, $action);
+        $status = json_decode($result['result'], true);
+
+        if ($result['success'] &&
+            ($status['ocs']['meta']['statuscode'] === 100 ||
+                $status['ocs']['meta']['statuscode'] === 200
+            )
+        ) {
+            return true;
+        } elseif ($try === 0) {
+            // only add new job on first try
+            $this->jobList->add('OCA\FederatedFileSharing\BackgroundJob\RetryJob',
+                [
+                    'remote' => $remote,
+                    'remoteId' => $remoteId,
+                    'token' => $token,
+                    'action' => $action,
+                    'data' => json_encode($data),
+                    'try' => $try,
+                    'lastRun' => $this->getTimestamp()
+                ]
+            );
+        }
+
+        return false;
+    }
+
+
+    /**
+     * return current timestamp
+     *
+     * @return int
+     */
+    protected function getTimestamp() {
+        return time();
+    }
+
+    /**
+     * try http post with the given protocol, if no protocol is given we pick
+     * the secure one (https)
+     *
+     * @param string $remoteDomain
+     * @param string $urlSuffix
+     * @param array $fields post parameters
+     * @param string $action define the action (possible values: share, reshare, accept, decline, unshare, revoke, permissions)
+     * @return array
+     * @throws \Exception
+     */
+    protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action="share") {
+
+        if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
+            $remoteDomain = 'https://' . $remoteDomain;
+        }
+
+        $result = [
+            'success' => false,
+            'result' => '',
+        ];
+
+        // if possible we use the new OCM API
+        $ocmResult = $this->tryOCMEndPoint($remoteDomain, $fields, $action);
+        if ($ocmResult) {
+            $result['success'] = true;
+            return $result;
+        }
+
+        return $this->tryLegacyEndPoint($remoteDomain, $urlSuffix, $fields);
+    }
+
+    /**
+     * try old federated sharing API if the OCM api doesn't work
+     *
+     * @param $remoteDomain
+     * @param $urlSuffix
+     * @param array $fields
+     * @return mixed
+     * @throws \Exception
+     */
+    protected function tryLegacyEndPoint($remoteDomain, $urlSuffix, array $fields) {
+
+        $result = [
+            'success' => false,
+            'result' => '',
+        ];
+
+        // Fall back to old API
+        $client = $this->httpClientService->newClient();
+        $federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
+        $endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
+        try {
+            $response = $client->post($remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT, [
+                'body' => $fields,
+                'timeout' => 10,
+                'connect_timeout' => 10,
+            ]);
+            $result['result'] = $response->getBody();
+            $result['success'] = true;
+        } catch (\Exception $e) {
+            // if flat re-sharing is not supported by the remote server
+            // we re-throw the exception and fall back to the old behaviour.
+            // (flat re-shares has been introduced in Nextcloud 9.1)
+            if ($e->getCode() === Http::STATUS_INTERNAL_SERVER_ERROR) {
+                throw $e;
+            }
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * check if server supports the new OCM api and ask for the correct end-point
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function getOCMEndPoint($url) {
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get($url, ['timeout' => 10, 'connect_timeout' => 10]);
+        } catch (\Exception $e) {
+            return '';
+        }
+
+        $result = $response->getBody();
+        $result = json_decode($result, true);
+
+        if (isset($result['end-point'])) {
+            return $result['end-point'];
+        }
+
+        return '';
+    }
+
+    /**
+     * send action regarding federated sharing to the remote server using the OCM API
+     *
+     * @param $remoteDomain
+     * @param $fields
+     * @param $action
+     *
+     * @return bool
+     */
+    protected function tryOCMEndPoint($remoteDomain, $fields, $action) {
+        switch ($action) {
+            case 'share':
+                $share = $this->cloudFederationFactory->getCloudFederationShare(
+                    $fields['shareWith'] . '@' . $remoteDomain,
+                    $fields['name'],
+                    '',
+                    $fields['remoteId'],
+                    $fields['ownerFederatedId'],
+                    $fields['owner'],
+                    $fields['sharedByFederatedId'],
+                    $fields['sharedBy'],
+                    $fields['token'],
+                    'user',
+                    'file'
+                );
+                return $this->federationProviderManager->sendShare($share);
+            case 'reshare':
+                // ask owner to reshare a file
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage('REQUEST_RESHARE',
+                    'file',
+                    $fields['remoteId'],
+                    [
+                        'sharedSecret' => $fields['token'],
+                        'shareWith' => $fields['shareWith'],
+                        'senderId' => $fields['localId'],
+                        'message' => 'Ask owner to reshare the file'
+                    ]
+                );
+                return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
+            case 'unshare':
+                //owner unshares the file from the recipient again
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage('SHARE_UNSHARED',
+                    'file',
+                    $fields['remoteId'],
+                    [
+                        'sharedSecret' => $fields['token'],
+                    ]
+                );
+                return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
+                return false;
+        }
+
+        return false;
+
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -117,7 +117,7 @@ 
 			$ocsStatus = isset($status['ocs']);
 			$ocsSuccess = $ocsStatus && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
 
-			if ($result['success'] && (!$ocsStatus ||$ocsSuccess)) {
+			if ($result['success'] && (!$ocsStatus || $ocsSuccess)) {
 				\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
 				return true;
 			}
@@ -160,7 +160,7 @@ 
 			return [$ocmResult['token'], $ocmResult['providerId']];
 		}
 
-		$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
+		$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/'.$id.'/reshare', $fields);
 		$status = json_decode($result['result'], true);
 
 		$httpRequestSuccessful = $result['success'];
@@ -171,7 +171,7 @@ 
 		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
 			return [
 				$status['ocs']['data']['token'],
-				(int)$status['ocs']['data']['remoteId']
+				(int) $status['ocs']['data']['remoteId']
 			];
 		}
 
@@ -258,7 +258,7 @@ 
 			$fields[$key] = $value;
 		}
 
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields, $action);
+		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/'.$remoteId.'/'.$action, $fields, $action);
 		$status = json_decode($result['result'], true);
 
 		if ($result['success'] &&
@@ -306,10 +306,10 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action="share") {
+	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action = "share") {
 
 		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
-			$remoteDomain = 'https://' . $remoteDomain;
+			$remoteDomain = 'https://'.$remoteDomain;
 		}
 
 		$result = [
@@ -348,7 +348,7 @@ 
 		$federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
 		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
 		try {
-			$response = $client->post($remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT, [
+			$response = $client->post($remoteDomain.$endpoint.$urlSuffix.'?format='.self::RESPONSE_FORMAT, [
 				'body' => $fields,
 				'timeout' => 10,
 				'connect_timeout' => 10,
@@ -405,7 +405,7 @@ 
 		switch ($action) {
 			case 'share':
 				$share = $this->cloudFederationFactory->getCloudFederationShare(
-					$fields['shareWith'] . '@' . $remoteDomain,
+					$fields['shareWith'].'@'.$remoteDomain,
 					$fields['name'],
 					'',
 					$fields['remoteId'],

apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php

Doc Comments +5 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
 	 * share received from another server
 	 *
 	 * @param ICloudFederationShare $share
-	 * @return string provider specific unique ID of the share
+	 * @return integer provider specific unique ID of the share
 	 *
 	 * @throws ProviderCouldNotAddShareException
 	 * @throws \OCP\AppFramework\QueryException
@@ -469,6 +469,9 @@ 
 		return [];
 	}
 
+	/**
+	 * @param string $id
+	 */
 	private function unshare($id, $notification) {
 		error_log("new unshare!");
 		if (!$this->isS2SEnabled(true)) {
@@ -546,7 +549,7 @@ 
 	/**
 	 * recipient of a share request to re-share the file with another user
 	 *
-	 * @param $id
+	 * @param string $id
 	 * @param $notification
 	 * @return array
 	 * @throws AuthenticationFailedException

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use OCA\FederatedFileSharing\AddressHandler;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCP\Activity\IManager as IActivityManager;
-use OCP\Activity\IManager;
 use OCP\App\IAppManager;
 use OCP\Constants;
 use OCP\Federation\Exceptions\ActionNotSupportedException;

Indentation +627 added lines, -627 removed lines

@@ -52,633 +52,633 @@
 
 class CloudFederationProviderFiles implements ICloudFederationProvider {
 
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	/** @var AddressHandler */
-	private $addressHandler;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-
-	/** @var IActivityManager */
-	private $activityManager;
-
-	/** @var INotificationManager */
-	private $notificationManager;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ICloudFederationFactory */
-	private $cloudFederationFactory;
-
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
-
-	/** @var IDBConnection */
-	private $connection;
-
-	/**
-	 * CloudFederationProvider constructor.
-	 *
-	 * @param IAppManager $appManager
-	 * @param FederatedShareProvider $federatedShareProvider
-	 * @param AddressHandler $addressHandler
-	 * @param ILogger $logger
-	 * @param IUserManager $userManager
-	 * @param ICloudIdManager $cloudIdManager
-	 * @param IActivityManager $activityManager
-	 * @param INotificationManager $notificationManager
-	 * @param IURLGenerator $urlGenerator
-	 * @param ICloudFederationFactory $cloudFederationFactory
-	 * @param ICloudFederationProviderManager $cloudFederationProviderManager
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IAppManager $appManager,
-								FederatedShareProvider $federatedShareProvider,
-								AddressHandler $addressHandler,
-								ILogger $logger,
-								IUserManager $userManager,
-								ICloudIdManager $cloudIdManager,
-								IActivityManager $activityManager,
-								INotificationManager $notificationManager,
-								IURLGenerator $urlGenerator,
-								ICloudFederationFactory $cloudFederationFactory,
-								ICloudFederationProviderManager $cloudFederationProviderManager,
-								IDBConnection $connection
-	) {
-		$this->appManager = $appManager;
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->addressHandler = $addressHandler;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->activityManager = $activityManager;
-		$this->notificationManager = $notificationManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->cloudFederationFactory = $cloudFederationFactory;
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
-		$this->connection = $connection;
-	}
-
-
-
-	/**
-	 * @return string
-	 */
-	public function getShareType() {
-		return 'file';
-	}
-
-	/**
-	 * share received from another server
-	 *
-	 * @param ICloudFederationShare $share
-	 * @return string provider specific unique ID of the share
-	 *
-	 * @throws ProviderCouldNotAddShareException
-	 * @throws \OCP\AppFramework\QueryException
-	 * @throws \OC\HintException
-	 * @since 14.0.0
-	 */
-	public function shareReceived(ICloudFederationShare $share) {
-
-		if (!$this->isS2SEnabled(true)) {
-			throw new ProviderCouldNotAddShareException('Server does not support federated cloud sharing', '', Http::STATUS_SERVICE_UNAVAILABLE);
-		}
-
-		$protocol = $share->getProtocol();
-		if ($protocol['name'] !== 'webdav') {
-			throw new ProviderCouldNotAddShareException('Unsupported protocol for data exchange.', '', Http::STATUS_NOT_IMPLEMENTED);
-		}
-
-		list($ownerUid, $remote) = $this->addressHandler->splitUserRemote($share->getOwner());
-
-		$remote = $remote;
-		$token = $share->getShareSecret();
-		$name = $share->getResourceName();
-		$owner = $share->getOwnerDisplayName();
-		$sharedBy = $share->getSharedByDisplayName();
-		$shareWith = $share->getShareWith();
-		$remoteId = $share->getProviderId();
-		$sharedByFederatedId = $share->getSharedBy();
-		$ownerFederatedId = $share->getOwner();
-
-		// if no explicit information about the person who created the share was send
-		// we assume that the share comes from the owner
-		if ($sharedByFederatedId === null) {
-			$sharedBy = $owner;
-			$sharedByFederatedId = $ownerFederatedId;
-		}
-
-		if ($remote && $token && $name && $owner && $remoteId && $shareWith) {
-
-			if (!Util::isValidFileName($name)) {
-				throw new ProviderCouldNotAddShareException('The mountpoint name contains invalid characters.', '', Http::STATUS_BAD_REQUEST);
-			}
-
-			// FIXME this should be a method in the user management instead
-			$this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
-			Util::emitHook(
-				'\OCA\Files_Sharing\API\Server2Server',
-				'preLoginNameUsedAsUserName',
-				array('uid' => &$shareWith)
-			);
-			$this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
-
-			if (!$this->userManager->userExists($shareWith)) {
-				throw new ProviderCouldNotAddShareException('User does not exists', '',Http::STATUS_BAD_REQUEST);
-			}
-
-			\OC_Util::setupFS($shareWith);
-
-			$externalManager = new \OCA\Files_Sharing\External\Manager(
-				\OC::$server->getDatabaseConnection(),
-				Filesystem::getMountManager(),
-				Filesystem::getLoader(),
-				\OC::$server->getHTTPClientService(),
-				\OC::$server->getNotificationManager(),
-				\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
-				\OC::$server->getCloudFederationProviderManager(),
-				\OC::$server->getCloudFederationFactory(),
-				$shareWith
-			);
-
-			try {
-				$externalManager->addShare($remote, $token, '', $name, $owner, false, $shareWith, $remoteId);
-				$shareId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share_external');
-
-				$event = $this->activityManager->generateEvent();
-				$event->setApp('files_sharing')
-					->setType('remote_share')
-					->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
-					->setAffectedUser($shareWith)
-					->setObject('remote_share', (int)$shareId, $name);
-				\OC::$server->getActivityManager()->publish($event);
-
-				$notification = $this->notificationManager->createNotification();
-				$notification->setApp('files_sharing')
-					->setUser($shareWith)
-					->setDateTime(new \DateTime())
-					->setObject('remote_share', $shareId)
-					->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/')]);
-
-				$declineAction = $notification->createAction();
-				$declineAction->setLabel('decline')
-					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
-				$notification->addAction($declineAction);
-
-				$acceptAction = $notification->createAction();
-				$acceptAction->setLabel('accept')
-					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
-				$notification->addAction($acceptAction);
-
-				$this->notificationManager->notify($notification);
-
-				return $shareId;
-			} catch (\Exception $e) {
-				$this->logger->logException($e, [
-					'message' => 'Server can not add remote share.',
-					'level' => Util::ERROR,
-					'app' => 'files_sharing'
-				]);
-				throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from ' . $remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
-			}
-		}
-
-		throw new ProviderCouldNotAddShareException('server can not add remote share, missing parameter', '', HTTP::STATUS_BAD_REQUEST);
-
-	}
-
-	/**
-	 * notification received from another server
-	 *
-	 * @param string $notificationType (e.g. SHARE_ACCEPTED)
-	 * @param string $providerId id of the share
-	 * @param array $notification payload of the notification
-	 * @return array data send back to the sender
-	 *
-	 * @throws ActionNotSupportedException
-	 * @throws AuthenticationFailedException
-	 * @throws BadRequestException
-	 * @throws ShareNotFoundException
-	 * @throws \OC\HintException
-	 * @since 14.0.0
-	 */
-	public function notificationReceived($notificationType, $providerId, array $notification) {
-
-		switch ($notificationType) {
-			case 'SHARE_ACCEPTED':
-				return $this->shareAccepted($providerId, $notification);
-			case 'SHARE_DECLINED':
-				return $this->shareDeclined($providerId, $notification);
-			case 'SHARE_UNSHARED':
-				return $this->unshare($providerId, $notification);
-			case 'REQUEST_RESHARE':
-				return $this->reshareRequested($providerId, $notification);
-			case 'RESHARE_UNDO':
-				return $this->undoReshare($providerId, $notification);
-		}
-
-
-		throw new BadRequestException([$notificationType]);
-	}
-
-	/**
-	 * process notification that the recipient accepted a share
-	 *
-	 * @param string $id
-	 * @param array $notification
-	 * @return array
-	 * @throws ActionNotSupportedException
-	 * @throws AuthenticationFailedException
-	 * @throws BadRequestException
-	 * @throws ShareNotFoundException
-	 * @throws \OC\HintException
-	 */
-	private function shareAccepted($id, $notification) {
-
-		if (!$this->isS2SEnabled()) {
-			throw new ActionNotSupportedException('Server does not support federated cloud sharing');
-		}
-
-		if (!isset($notification['sharedSecret'])) {
-			throw new BadRequestException(['sharedSecret']);
-		}
-
-		$token = $notification['sharedSecret'];
-
-		$share = $this->federatedShareProvider->getShareById($id);
-
-		$this->verifyShare($share, $token);
-		$this->executeAcceptShare($share);
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
-			$remoteId = $this->federatedShareProvider->getRemoteId($share);
-			$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-			$notification->setMessage(
-				'SHARE_ACCEPTED',
-				'file',
-				$remoteId,
-				[
-					'sharedSecret' => $token,
-					'message' => 'Recipient accepted the re-share'
-				]
-
-			);
-			$this->cloudFederationProviderManager->sendNotification($remote, $notification);
-
-		}
-
-		return [];
-	}
-
-	/**
-	 * @param IShare $share
-	 * @throws ShareNotFoundException
-	 */
-	protected function executeAcceptShare(IShare $share) {
-		try {
-			$fileId = (int)$share->getNode()->getId();
-			list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
-		} catch (\Exception $e) {
-			throw new ShareNotFoundException();
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('files_sharing')
-			->setType('remote_share')
-			->setAffectedUser($this->getCorrectUid($share))
-			->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_ACCEPTED, [$share->getSharedWith(), [$fileId => $file]])
-			->setObject('files', $fileId, $file)
-			->setLink($link);
-		$this->activityManager->publish($event);
-	}
-
-	/**
-	 * process notification that the recipient declined a share
-	 *
-	 * @param string $id
-	 * @param array $notification
-	 * @return array
-	 * @throws ActionNotSupportedException
-	 * @throws AuthenticationFailedException
-	 * @throws BadRequestException
-	 * @throws ShareNotFound
-	 * @throws ShareNotFoundException
-	 * @throws \OC\HintException
-	 *
-	 */
-	protected function shareDeclined($id, $notification) {
-
-		if (!$this->isS2SEnabled()) {
-			throw new ActionNotSupportedException('Server does not support federated cloud sharing');
-		}
-
-		if (!isset($notification['sharedSecret'])) {
-			throw new BadRequestException(['sharedSecret']);
-		}
-
-		$token = $notification['sharedSecret'];
-
-		$share = $this->federatedShareProvider->getShareById($id);
-
-		$this->verifyShare($share, $token);
-
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
-			$remoteId = $this->federatedShareProvider->getRemoteId($share);
-			$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-			$notification->setMessage(
-				'SHARE_DECLINED',
-				'file',
-				$remoteId,
-				[
-					'sharedSecret' => $token,
-					'message' => 'Recipient declined the re-share'
-				]
-
-			);
-			$this->cloudFederationProviderManager->sendNotification($remote, $notification);
-		}
-
-		$this->executeDeclineShare($share);
-
-		return [];
-
-	}
-
-	/**
-	 * delete declined share and create a activity
-	 *
-	 * @param IShare $share
-	 * @throws ShareNotFoundException
-	 */
-	protected function executeDeclineShare(IShare $share) {
-		$this->federatedShareProvider->removeShareFromTable($share);
-
-		try {
-			$fileId = (int)$share->getNode()->getId();
-			list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
-		} catch (\Exception $e) {
-			throw new ShareNotFoundException();
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('files_sharing')
-			->setType('remote_share')
-			->setAffectedUser($this->getCorrectUid($share))
-			->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_DECLINED, [$share->getSharedWith(), [$fileId => $file]])
-			->setObject('files', $fileId, $file)
-			->setLink($link);
-		$this->activityManager->publish($event);
-
-	}
-
-	/**
-	 * received the notification that the owner unshared a file from you
-	 *
-	 * @param string $id
-	 * @param string $notification
-	 * @return array
-	 * @throws AuthenticationFailedException
-	 * @throws BadRequestException
-	 * @throws ShareNotFoundException
-	 */
-	private function undoReshare($id, $notification) {
-
-		if (!isset($notification['sharedSecret'])) {
-			throw new BadRequestException(['sharedSecret']);
-		}
-		$token = $notification['sharedSecret'];
-
-		$share = $this->federatedShareProvider->getShareById($id);
-
-		$this->verifyShare($share, $token);
-		$this->federatedShareProvider->removeShareFromTable($share);
-		return [];
-	}
-
-	private function unshare($id, $notification) {
-		error_log("new unshare!");
-		if (!$this->isS2SEnabled(true)) {
-			throw new ActionNotSupportedException("incoming shares disabled!");
-		}
-
-		if (!isset($notification['sharedSecret'])) {
-			throw new BadRequestException(['sharedSecret']);
-		}
-		$token = $notification['sharedSecret'];
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('share_external')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->eq('remote_id', $qb->createNamedParameter($id)),
-					$qb->expr()->eq('share_token', $qb->createNamedParameter($token))
-				)
-			);
-
-		$result = $qb->execute();
-		$share = $result->fetch();
-		$result->closeCursor();
-
-		if ($token && $id && !empty($share)) {
-
-			$remote = $this->cleanupRemote($share['remote']);
-
-			$owner = $this->cloudIdManager->getCloudId($share['owner'], $remote);
-			$mountpoint = $share['mountpoint'];
-			$user = $share['user'];
-
-			$qb = $this->connection->getQueryBuilder();
-			$qb->delete('share_external')
-				->where(
-					$qb->expr()->andX(
-						$qb->expr()->eq('remote_id', $qb->createNamedParameter($id)),
-						$qb->expr()->eq('share_token', $qb->createNamedParameter($token))
-					)
-				);
-
-			$qb->execute();
-
-			if ($share['accepted']) {
-				$path = trim($mountpoint, '/');
-			} else {
-				$path = trim($share['name'], '/');
-			}
-
-			$notification = $this->notificationManager->createNotification();
-			$notification->setApp('files_sharing')
-				->setUser($share['user'])
-				->setObject('remote_share', (int)$share['id']);
-			$this->notificationManager->markProcessed($notification);
-
-			$event = $this->activityManager->generateEvent();
-			$event->setApp('files_sharing')
-				->setType('remote_share')
-				->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_UNSHARED, [$owner->getId(), $path])
-				->setAffectedUser($user)
-				->setObject('remote_share', (int)$share['id'], $path);
-			\OC::$server->getActivityManager()->publish($event);
-		}
-
-		return [];
-	}
-
-	private function cleanupRemote($remote) {
-		$remote = substr($remote, strpos($remote, '://') + 3);
-
-		return rtrim($remote, '/');
-	}
-
-	/**
-	 * recipient of a share request to re-share the file with another user
-	 *
-	 * @param $id
-	 * @param $notification
-	 * @return array
-	 * @throws AuthenticationFailedException
-	 * @throws BadRequestException
-	 * @throws ProviderCouldNotAddShareException
-	 * @throws ShareNotFoundException
-	 * @throws ShareNotFound
-	 */
-	protected function reshareRequested($id, $notification) {
-
-		if (!isset($notification['sharedSecret'])) {
-			throw new BadRequestException(['sharedSecret']);
-		}
-		$token = $notification['sharedSecret'];
-
-		if (!isset($notification['shareWith'])) {
-			throw new BadRequestException(['shareWith']);
-		}
-		$shareWith = $notification['shareWith'];
-
-		if (!isset($notification['senderId'])) {
-			throw new BadRequestException(['senderId']);
-		}
-		$senderId = $notification['senderId'];
-
-		$share = $this->federatedShareProvider->getShareById($id);
-		// don't allow to share a file back to the owner
-		try {
-			list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
-			$owner = $share->getShareOwner();
-			$currentServer = $this->addressHandler->generateRemoteURL();
-			if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
-				throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: ' . $id);
-			}
-		} catch (\Exception $e) {
-			throw new ProviderCouldNotAddShareException($e->getMessage());
-		}
-
-		$this->verifyShare($share, $token);
-
-		// check if re-sharing is allowed
-		if ($share->getPermissions() | ~Constants::PERMISSION_SHARE) {
-			// the recipient of the initial share is now the initiator for the re-share
-			$share->setSharedBy($share->getSharedWith());
-			$share->setSharedWith($shareWith);
-			$result = $this->federatedShareProvider->create($share);
-			$this->federatedShareProvider->storeRemoteId((int)$result->getId(), $senderId);
-			return ['token' => $result->getToken(), 'providerId' => $result->getId()];
-		} else {
-			throw new ProviderCouldNotAddShareException('resharing not allowed for share: ' . $id);
-		}
-
-		throw new BadRequestException([]);
-	}
-
-	/**
-	 * get file
-	 *
-	 * @param string $user
-	 * @param int $fileSource
-	 * @return array with internal path of the file and a absolute link to it
-	 */
-	private function getFile($user, $fileSource) {
-		\OC_Util::setupFS($user);
-
-		try {
-			$file = Filesystem::getPath($fileSource);
-		} catch (NotFoundException $e) {
-			$file = null;
-		}
-		$args = Filesystem::is_dir($file) ? array('dir' => $file) : array('dir' => dirname($file), 'scrollto' => $file);
-		$link = Util::linkToAbsolute('files', 'index.php', $args);
-
-		return array($file, $link);
-
-	}
-
-	/**
-	 * check if we are the initiator or the owner of a re-share and return the correct UID
-	 *
-	 * @param IShare $share
-	 * @return string
-	 */
-	protected function getCorrectUid(IShare $share) {
-		if ($this->userManager->userExists($share->getShareOwner())) {
-			return $share->getShareOwner();
-		}
-
-		return $share->getSharedBy();
-	}
-
-
-
-	/**
-	 * check if we got the right share
-	 *
-	 * @param IShare $share
-	 * @param string $token
-	 * @return bool
-	 * @throws AuthenticationFailedException
-	 */
-	protected function verifyShare(IShare $share, $token) {
-		if (
-			$share->getShareType() === FederatedShareProvider::SHARE_TYPE_REMOTE &&
-			$share->getToken() === $token
-		) {
-			return true;
-		}
-
-		throw new AuthenticationFailedException();
-	}
-
-
-
-	/**
-	 * check if server-to-server sharing is enabled
-	 *
-	 * @param bool $incoming
-	 * @return bool
-	 */
-	private function isS2SEnabled($incoming = false) {
-
-		$result = $this->appManager->isEnabledForUser('files_sharing');
-
-		if ($incoming) {
-			$result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled();
-		} else {
-			$result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		}
-
-		return $result;
-	}
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+
+    /** @var AddressHandler */
+    private $addressHandler;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+
+    /** @var IActivityManager */
+    private $activityManager;
+
+    /** @var INotificationManager */
+    private $notificationManager;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ICloudFederationFactory */
+    private $cloudFederationFactory;
+
+    /** @var ICloudFederationProviderManager */
+    private $cloudFederationProviderManager;
+
+    /** @var IDBConnection */
+    private $connection;
+
+    /**
+     * CloudFederationProvider constructor.
+     *
+     * @param IAppManager $appManager
+     * @param FederatedShareProvider $federatedShareProvider
+     * @param AddressHandler $addressHandler
+     * @param ILogger $logger
+     * @param IUserManager $userManager
+     * @param ICloudIdManager $cloudIdManager
+     * @param IActivityManager $activityManager
+     * @param INotificationManager $notificationManager
+     * @param IURLGenerator $urlGenerator
+     * @param ICloudFederationFactory $cloudFederationFactory
+     * @param ICloudFederationProviderManager $cloudFederationProviderManager
+     * @param IDBConnection $connection
+     */
+    public function __construct(IAppManager $appManager,
+                                FederatedShareProvider $federatedShareProvider,
+                                AddressHandler $addressHandler,
+                                ILogger $logger,
+                                IUserManager $userManager,
+                                ICloudIdManager $cloudIdManager,
+                                IActivityManager $activityManager,
+                                INotificationManager $notificationManager,
+                                IURLGenerator $urlGenerator,
+                                ICloudFederationFactory $cloudFederationFactory,
+                                ICloudFederationProviderManager $cloudFederationProviderManager,
+                                IDBConnection $connection
+    ) {
+        $this->appManager = $appManager;
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->addressHandler = $addressHandler;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->activityManager = $activityManager;
+        $this->notificationManager = $notificationManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->cloudFederationFactory = $cloudFederationFactory;
+        $this->cloudFederationProviderManager = $cloudFederationProviderManager;
+        $this->connection = $connection;
+    }
+
+
+
+    /**
+     * @return string
+     */
+    public function getShareType() {
+        return 'file';
+    }
+
+    /**
+     * share received from another server
+     *
+     * @param ICloudFederationShare $share
+     * @return string provider specific unique ID of the share
+     *
+     * @throws ProviderCouldNotAddShareException
+     * @throws \OCP\AppFramework\QueryException
+     * @throws \OC\HintException
+     * @since 14.0.0
+     */
+    public function shareReceived(ICloudFederationShare $share) {
+
+        if (!$this->isS2SEnabled(true)) {
+            throw new ProviderCouldNotAddShareException('Server does not support federated cloud sharing', '', Http::STATUS_SERVICE_UNAVAILABLE);
+        }
+
+        $protocol = $share->getProtocol();
+        if ($protocol['name'] !== 'webdav') {
+            throw new ProviderCouldNotAddShareException('Unsupported protocol for data exchange.', '', Http::STATUS_NOT_IMPLEMENTED);
+        }
+
+        list($ownerUid, $remote) = $this->addressHandler->splitUserRemote($share->getOwner());
+
+        $remote = $remote;
+        $token = $share->getShareSecret();
+        $name = $share->getResourceName();
+        $owner = $share->getOwnerDisplayName();
+        $sharedBy = $share->getSharedByDisplayName();
+        $shareWith = $share->getShareWith();
+        $remoteId = $share->getProviderId();
+        $sharedByFederatedId = $share->getSharedBy();
+        $ownerFederatedId = $share->getOwner();
+
+        // if no explicit information about the person who created the share was send
+        // we assume that the share comes from the owner
+        if ($sharedByFederatedId === null) {
+            $sharedBy = $owner;
+            $sharedByFederatedId = $ownerFederatedId;
+        }
+
+        if ($remote && $token && $name && $owner && $remoteId && $shareWith) {
+
+            if (!Util::isValidFileName($name)) {
+                throw new ProviderCouldNotAddShareException('The mountpoint name contains invalid characters.', '', Http::STATUS_BAD_REQUEST);
+            }
+
+            // FIXME this should be a method in the user management instead
+            $this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
+            Util::emitHook(
+                '\OCA\Files_Sharing\API\Server2Server',
+                'preLoginNameUsedAsUserName',
+                array('uid' => &$shareWith)
+            );
+            $this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
+
+            if (!$this->userManager->userExists($shareWith)) {
+                throw new ProviderCouldNotAddShareException('User does not exists', '',Http::STATUS_BAD_REQUEST);
+            }
+
+            \OC_Util::setupFS($shareWith);
+
+            $externalManager = new \OCA\Files_Sharing\External\Manager(
+                \OC::$server->getDatabaseConnection(),
+                Filesystem::getMountManager(),
+                Filesystem::getLoader(),
+                \OC::$server->getHTTPClientService(),
+                \OC::$server->getNotificationManager(),
+                \OC::$server->query(\OCP\OCS\IDiscoveryService::class),
+                \OC::$server->getCloudFederationProviderManager(),
+                \OC::$server->getCloudFederationFactory(),
+                $shareWith
+            );
+
+            try {
+                $externalManager->addShare($remote, $token, '', $name, $owner, false, $shareWith, $remoteId);
+                $shareId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share_external');
+
+                $event = $this->activityManager->generateEvent();
+                $event->setApp('files_sharing')
+                    ->setType('remote_share')
+                    ->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
+                    ->setAffectedUser($shareWith)
+                    ->setObject('remote_share', (int)$shareId, $name);
+                \OC::$server->getActivityManager()->publish($event);
+
+                $notification = $this->notificationManager->createNotification();
+                $notification->setApp('files_sharing')
+                    ->setUser($shareWith)
+                    ->setDateTime(new \DateTime())
+                    ->setObject('remote_share', $shareId)
+                    ->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/')]);
+
+                $declineAction = $notification->createAction();
+                $declineAction->setLabel('decline')
+                    ->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
+                $notification->addAction($declineAction);
+
+                $acceptAction = $notification->createAction();
+                $acceptAction->setLabel('accept')
+                    ->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
+                $notification->addAction($acceptAction);
+
+                $this->notificationManager->notify($notification);
+
+                return $shareId;
+            } catch (\Exception $e) {
+                $this->logger->logException($e, [
+                    'message' => 'Server can not add remote share.',
+                    'level' => Util::ERROR,
+                    'app' => 'files_sharing'
+                ]);
+                throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from ' . $remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
+            }
+        }
+
+        throw new ProviderCouldNotAddShareException('server can not add remote share, missing parameter', '', HTTP::STATUS_BAD_REQUEST);
+
+    }
+
+    /**
+     * notification received from another server
+     *
+     * @param string $notificationType (e.g. SHARE_ACCEPTED)
+     * @param string $providerId id of the share
+     * @param array $notification payload of the notification
+     * @return array data send back to the sender
+     *
+     * @throws ActionNotSupportedException
+     * @throws AuthenticationFailedException
+     * @throws BadRequestException
+     * @throws ShareNotFoundException
+     * @throws \OC\HintException
+     * @since 14.0.0
+     */
+    public function notificationReceived($notificationType, $providerId, array $notification) {
+
+        switch ($notificationType) {
+            case 'SHARE_ACCEPTED':
+                return $this->shareAccepted($providerId, $notification);
+            case 'SHARE_DECLINED':
+                return $this->shareDeclined($providerId, $notification);
+            case 'SHARE_UNSHARED':
+                return $this->unshare($providerId, $notification);
+            case 'REQUEST_RESHARE':
+                return $this->reshareRequested($providerId, $notification);
+            case 'RESHARE_UNDO':
+                return $this->undoReshare($providerId, $notification);
+        }
+
+
+        throw new BadRequestException([$notificationType]);
+    }
+
+    /**
+     * process notification that the recipient accepted a share
+     *
+     * @param string $id
+     * @param array $notification
+     * @return array
+     * @throws ActionNotSupportedException
+     * @throws AuthenticationFailedException
+     * @throws BadRequestException
+     * @throws ShareNotFoundException
+     * @throws \OC\HintException
+     */
+    private function shareAccepted($id, $notification) {
+
+        if (!$this->isS2SEnabled()) {
+            throw new ActionNotSupportedException('Server does not support federated cloud sharing');
+        }
+
+        if (!isset($notification['sharedSecret'])) {
+            throw new BadRequestException(['sharedSecret']);
+        }
+
+        $token = $notification['sharedSecret'];
+
+        $share = $this->federatedShareProvider->getShareById($id);
+
+        $this->verifyShare($share, $token);
+        $this->executeAcceptShare($share);
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
+            $remoteId = $this->federatedShareProvider->getRemoteId($share);
+            $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+            $notification->setMessage(
+                'SHARE_ACCEPTED',
+                'file',
+                $remoteId,
+                [
+                    'sharedSecret' => $token,
+                    'message' => 'Recipient accepted the re-share'
+                ]
+
+            );
+            $this->cloudFederationProviderManager->sendNotification($remote, $notification);
+
+        }
+
+        return [];
+    }
+
+    /**
+     * @param IShare $share
+     * @throws ShareNotFoundException
+     */
+    protected function executeAcceptShare(IShare $share) {
+        try {
+            $fileId = (int)$share->getNode()->getId();
+            list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
+        } catch (\Exception $e) {
+            throw new ShareNotFoundException();
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('files_sharing')
+            ->setType('remote_share')
+            ->setAffectedUser($this->getCorrectUid($share))
+            ->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_ACCEPTED, [$share->getSharedWith(), [$fileId => $file]])
+            ->setObject('files', $fileId, $file)
+            ->setLink($link);
+        $this->activityManager->publish($event);
+    }
+
+    /**
+     * process notification that the recipient declined a share
+     *
+     * @param string $id
+     * @param array $notification
+     * @return array
+     * @throws ActionNotSupportedException
+     * @throws AuthenticationFailedException
+     * @throws BadRequestException
+     * @throws ShareNotFound
+     * @throws ShareNotFoundException
+     * @throws \OC\HintException
+     *
+     */
+    protected function shareDeclined($id, $notification) {
+
+        if (!$this->isS2SEnabled()) {
+            throw new ActionNotSupportedException('Server does not support federated cloud sharing');
+        }
+
+        if (!isset($notification['sharedSecret'])) {
+            throw new BadRequestException(['sharedSecret']);
+        }
+
+        $token = $notification['sharedSecret'];
+
+        $share = $this->federatedShareProvider->getShareById($id);
+
+        $this->verifyShare($share, $token);
+
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
+            $remoteId = $this->federatedShareProvider->getRemoteId($share);
+            $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+            $notification->setMessage(
+                'SHARE_DECLINED',
+                'file',
+                $remoteId,
+                [
+                    'sharedSecret' => $token,
+                    'message' => 'Recipient declined the re-share'
+                ]
+
+            );
+            $this->cloudFederationProviderManager->sendNotification($remote, $notification);
+        }
+
+        $this->executeDeclineShare($share);
+
+        return [];
+
+    }
+
+    /**
+     * delete declined share and create a activity
+     *
+     * @param IShare $share
+     * @throws ShareNotFoundException
+     */
+    protected function executeDeclineShare(IShare $share) {
+        $this->federatedShareProvider->removeShareFromTable($share);
+
+        try {
+            $fileId = (int)$share->getNode()->getId();
+            list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
+        } catch (\Exception $e) {
+            throw new ShareNotFoundException();
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('files_sharing')
+            ->setType('remote_share')
+            ->setAffectedUser($this->getCorrectUid($share))
+            ->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_DECLINED, [$share->getSharedWith(), [$fileId => $file]])
+            ->setObject('files', $fileId, $file)
+            ->setLink($link);
+        $this->activityManager->publish($event);
+
+    }
+
+    /**
+     * received the notification that the owner unshared a file from you
+     *
+     * @param string $id
+     * @param string $notification
+     * @return array
+     * @throws AuthenticationFailedException
+     * @throws BadRequestException
+     * @throws ShareNotFoundException
+     */
+    private function undoReshare($id, $notification) {
+
+        if (!isset($notification['sharedSecret'])) {
+            throw new BadRequestException(['sharedSecret']);
+        }
+        $token = $notification['sharedSecret'];
+
+        $share = $this->federatedShareProvider->getShareById($id);
+
+        $this->verifyShare($share, $token);
+        $this->federatedShareProvider->removeShareFromTable($share);
+        return [];
+    }
+
+    private function unshare($id, $notification) {
+        error_log("new unshare!");
+        if (!$this->isS2SEnabled(true)) {
+            throw new ActionNotSupportedException("incoming shares disabled!");
+        }
+
+        if (!isset($notification['sharedSecret'])) {
+            throw new BadRequestException(['sharedSecret']);
+        }
+        $token = $notification['sharedSecret'];
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share_external')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('remote_id', $qb->createNamedParameter($id)),
+                    $qb->expr()->eq('share_token', $qb->createNamedParameter($token))
+                )
+            );
+
+        $result = $qb->execute();
+        $share = $result->fetch();
+        $result->closeCursor();
+
+        if ($token && $id && !empty($share)) {
+
+            $remote = $this->cleanupRemote($share['remote']);
+
+            $owner = $this->cloudIdManager->getCloudId($share['owner'], $remote);
+            $mountpoint = $share['mountpoint'];
+            $user = $share['user'];
+
+            $qb = $this->connection->getQueryBuilder();
+            $qb->delete('share_external')
+                ->where(
+                    $qb->expr()->andX(
+                        $qb->expr()->eq('remote_id', $qb->createNamedParameter($id)),
+                        $qb->expr()->eq('share_token', $qb->createNamedParameter($token))
+                    )
+                );
+
+            $qb->execute();
+
+            if ($share['accepted']) {
+                $path = trim($mountpoint, '/');
+            } else {
+                $path = trim($share['name'], '/');
+            }
+
+            $notification = $this->notificationManager->createNotification();
+            $notification->setApp('files_sharing')
+                ->setUser($share['user'])
+                ->setObject('remote_share', (int)$share['id']);
+            $this->notificationManager->markProcessed($notification);
+
+            $event = $this->activityManager->generateEvent();
+            $event->setApp('files_sharing')
+                ->setType('remote_share')
+                ->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_UNSHARED, [$owner->getId(), $path])
+                ->setAffectedUser($user)
+                ->setObject('remote_share', (int)$share['id'], $path);
+            \OC::$server->getActivityManager()->publish($event);
+        }
+
+        return [];
+    }
+
+    private function cleanupRemote($remote) {
+        $remote = substr($remote, strpos($remote, '://') + 3);
+
+        return rtrim($remote, '/');
+    }
+
+    /**
+     * recipient of a share request to re-share the file with another user
+     *
+     * @param $id
+     * @param $notification
+     * @return array
+     * @throws AuthenticationFailedException
+     * @throws BadRequestException
+     * @throws ProviderCouldNotAddShareException
+     * @throws ShareNotFoundException
+     * @throws ShareNotFound
+     */
+    protected function reshareRequested($id, $notification) {
+
+        if (!isset($notification['sharedSecret'])) {
+            throw new BadRequestException(['sharedSecret']);
+        }
+        $token = $notification['sharedSecret'];
+
+        if (!isset($notification['shareWith'])) {
+            throw new BadRequestException(['shareWith']);
+        }
+        $shareWith = $notification['shareWith'];
+
+        if (!isset($notification['senderId'])) {
+            throw new BadRequestException(['senderId']);
+        }
+        $senderId = $notification['senderId'];
+
+        $share = $this->federatedShareProvider->getShareById($id);
+        // don't allow to share a file back to the owner
+        try {
+            list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
+            $owner = $share->getShareOwner();
+            $currentServer = $this->addressHandler->generateRemoteURL();
+            if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
+                throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: ' . $id);
+            }
+        } catch (\Exception $e) {
+            throw new ProviderCouldNotAddShareException($e->getMessage());
+        }
+
+        $this->verifyShare($share, $token);
+
+        // check if re-sharing is allowed
+        if ($share->getPermissions() | ~Constants::PERMISSION_SHARE) {
+            // the recipient of the initial share is now the initiator for the re-share
+            $share->setSharedBy($share->getSharedWith());
+            $share->setSharedWith($shareWith);
+            $result = $this->federatedShareProvider->create($share);
+            $this->federatedShareProvider->storeRemoteId((int)$result->getId(), $senderId);
+            return ['token' => $result->getToken(), 'providerId' => $result->getId()];
+        } else {
+            throw new ProviderCouldNotAddShareException('resharing not allowed for share: ' . $id);
+        }
+
+        throw new BadRequestException([]);
+    }
+
+    /**
+     * get file
+     *
+     * @param string $user
+     * @param int $fileSource
+     * @return array with internal path of the file and a absolute link to it
+     */
+    private function getFile($user, $fileSource) {
+        \OC_Util::setupFS($user);
+
+        try {
+            $file = Filesystem::getPath($fileSource);
+        } catch (NotFoundException $e) {
+            $file = null;
+        }
+        $args = Filesystem::is_dir($file) ? array('dir' => $file) : array('dir' => dirname($file), 'scrollto' => $file);
+        $link = Util::linkToAbsolute('files', 'index.php', $args);
+
+        return array($file, $link);
+
+    }
+
+    /**
+     * check if we are the initiator or the owner of a re-share and return the correct UID
+     *
+     * @param IShare $share
+     * @return string
+     */
+    protected function getCorrectUid(IShare $share) {
+        if ($this->userManager->userExists($share->getShareOwner())) {
+            return $share->getShareOwner();
+        }
+
+        return $share->getSharedBy();
+    }
+
+
+
+    /**
+     * check if we got the right share
+     *
+     * @param IShare $share
+     * @param string $token
+     * @return bool
+     * @throws AuthenticationFailedException
+     */
+    protected function verifyShare(IShare $share, $token) {
+        if (
+            $share->getShareType() === FederatedShareProvider::SHARE_TYPE_REMOTE &&
+            $share->getToken() === $token
+        ) {
+            return true;
+        }
+
+        throw new AuthenticationFailedException();
+    }
+
+
+
+    /**
+     * check if server-to-server sharing is enabled
+     *
+     * @param bool $incoming
+     * @return bool
+     */
+    private function isS2SEnabled($incoming = false) {
+
+        $result = $this->appManager->isEnabledForUser('files_sharing');
+
+        if ($incoming) {
+            $result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled();
+        } else {
+            $result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        }
+
+        return $result;
+    }
 
 
 }

Spacing +14 added lines, -14 removed lines

@@ -188,16 +188,16 @@ 
 			}
 
 			// FIXME this should be a method in the user management instead
-			$this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
+			$this->logger->debug('shareWith before, '.$shareWith, ['app' => 'files_sharing']);
 			Util::emitHook(
 				'\OCA\Files_Sharing\API\Server2Server',
 				'preLoginNameUsedAsUserName',
 				array('uid' => &$shareWith)
 			);
-			$this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
+			$this->logger->debug('shareWith after, '.$shareWith, ['app' => 'files_sharing']);
 
 			if (!$this->userManager->userExists($shareWith)) {
-				throw new ProviderCouldNotAddShareException('User does not exists', '',Http::STATUS_BAD_REQUEST);
+				throw new ProviderCouldNotAddShareException('User does not exists', '', Http::STATUS_BAD_REQUEST);
 			}
 
 			\OC_Util::setupFS($shareWith);
@@ -223,7 +223,7 @@ 
 					->setType('remote_share')
 					->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
 					->setAffectedUser($shareWith)
-					->setObject('remote_share', (int)$shareId, $name);
+					->setObject('remote_share', (int) $shareId, $name);
 				\OC::$server->getActivityManager()->publish($event);
 
 				$notification = $this->notificationManager->createNotification();
@@ -235,12 +235,12 @@ 
 
 				$declineAction = $notification->createAction();
 				$declineAction->setLabel('decline')
-					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
+					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/'.$shareId)), 'DELETE');
 				$notification->addAction($declineAction);
 
 				$acceptAction = $notification->createAction();
 				$acceptAction->setLabel('accept')
-					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
+					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/'.$shareId)), 'POST');
 				$notification->addAction($acceptAction);
 
 				$this->notificationManager->notify($notification);
@@ -252,7 +252,7 @@ 
 					'level' => Util::ERROR,
 					'app' => 'files_sharing'
 				]);
-				throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from ' . $remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
+				throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from '.$remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
 			}
 		}
 
@@ -349,7 +349,7 @@ 
 	 */
 	protected function executeAcceptShare(IShare $share) {
 		try {
-			$fileId = (int)$share->getNode()->getId();
+			$fileId = (int) $share->getNode()->getId();
 			list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
 		} catch (\Exception $e) {
 			throw new ShareNotFoundException();
@@ -428,7 +428,7 @@ 
 		$this->federatedShareProvider->removeShareFromTable($share);
 
 		try {
-			$fileId = (int)$share->getNode()->getId();
+			$fileId = (int) $share->getNode()->getId();
 			list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
 		} catch (\Exception $e) {
 			throw new ShareNotFoundException();
@@ -522,7 +522,7 @@ 
 			$notification = $this->notificationManager->createNotification();
 			$notification->setApp('files_sharing')
 				->setUser($share['user'])
-				->setObject('remote_share', (int)$share['id']);
+				->setObject('remote_share', (int) $share['id']);
 			$this->notificationManager->markProcessed($notification);
 
 			$event = $this->activityManager->generateEvent();
@@ -530,7 +530,7 @@ 
 				->setType('remote_share')
 				->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_UNSHARED, [$owner->getId(), $path])
 				->setAffectedUser($user)
-				->setObject('remote_share', (int)$share['id'], $path);
+				->setObject('remote_share', (int) $share['id'], $path);
 			\OC::$server->getActivityManager()->publish($event);
 		}
 
@@ -579,7 +579,7 @@ 
 			$owner = $share->getShareOwner();
 			$currentServer = $this->addressHandler->generateRemoteURL();
 			if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
-				throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: ' . $id);
+				throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: '.$id);
 			}
 		} catch (\Exception $e) {
 			throw new ProviderCouldNotAddShareException($e->getMessage());
@@ -593,10 +593,10 @@ 
 			$share->setSharedBy($share->getSharedWith());
 			$share->setSharedWith($shareWith);
 			$result = $this->federatedShareProvider->create($share);
-			$this->federatedShareProvider->storeRemoteId((int)$result->getId(), $senderId);
+			$this->federatedShareProvider->storeRemoteId((int) $result->getId(), $senderId);
 			return ['token' => $result->getToken(), 'providerId' => $result->getId()];
 		} else {
-			throw new ProviderCouldNotAddShareException('resharing not allowed for share: ' . $id);
+			throw new ProviderCouldNotAddShareException('resharing not allowed for share: '.$id);
 		}
 
 		throw new BadRequestException([]);

lib/public/Federation/ICloudFederationProvider.php

Indentation +35 added lines, -35 removed lines

@@ -39,42 +39,42 @@
 
 interface ICloudFederationProvider {
 
-	/**
-	 * get the name of the share type, handled by this provider
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareType();
+    /**
+     * get the name of the share type, handled by this provider
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareType();
 
-	/**
-	 * share received from another server
-	 *
-	 * @param ICloudFederationShare $share
-	 * @return string provider specific unique ID of the share
-	 *
-	 * @throws ProviderCouldNotAddShareException
-	 *
-	 * @since 14.0.0
-	 */
-	public function shareReceived(ICloudFederationShare $share);
+    /**
+     * share received from another server
+     *
+     * @param ICloudFederationShare $share
+     * @return string provider specific unique ID of the share
+     *
+     * @throws ProviderCouldNotAddShareException
+     *
+     * @since 14.0.0
+     */
+    public function shareReceived(ICloudFederationShare $share);
 
-	/**
-	 * notification received from another server
-	 *
-	 * @param string $notificationType (e.g SHARE_ACCEPTED)
-	 * @param string $providerId share ID
-	 * @param array $notification provider specific notification
-	 * @return array $data send back to sender
-	 *
-	 * @throws ShareNotFoundException
-	 * @throws ActionNotSupportedException
-	 * @throws BadRequestException
-	 * @throws AuthenticationFailedException
-	 *
-	 * @since 14.0.0
-	 */
-	public function notificationReceived($notificationType, $providerId, array $notification);
+    /**
+     * notification received from another server
+     *
+     * @param string $notificationType (e.g SHARE_ACCEPTED)
+     * @param string $providerId share ID
+     * @param array $notification provider specific notification
+     * @return array $data send back to sender
+     *
+     * @throws ShareNotFoundException
+     * @throws ActionNotSupportedException
+     * @throws BadRequestException
+     * @throws AuthenticationFailedException
+     *
+     * @since 14.0.0
+     */
+    public function notificationReceived($notificationType, $providerId, array $notification);
 
 }

lib/public/Federation/ICloudFederationProviderManager.php

Indentation +64 added lines, -64 removed lines

@@ -32,76 +32,76 @@
  */
 interface ICloudFederationProviderManager {
 
-	/**
-	 * Registers an callback function which must return an cloud federation provider
-	 *
-	 * @param string $shareType which share type does the provider handles
-	 * @param string $displayName user facing name of the federated share provider
-	 * @param callable $callback
-	 * @throws Exceptions\ProviderAlreadyExistsException
-	 *
-	 * @since 14.0.0
-	 */
-	public function addCloudFederationProvider($shareType, $displayName, callable $callback);
+    /**
+     * Registers an callback function which must return an cloud federation provider
+     *
+     * @param string $shareType which share type does the provider handles
+     * @param string $displayName user facing name of the federated share provider
+     * @param callable $callback
+     * @throws Exceptions\ProviderAlreadyExistsException
+     *
+     * @since 14.0.0
+     */
+    public function addCloudFederationProvider($shareType, $displayName, callable $callback);
 
-	/**
-	 * remove cloud federation provider
-	 *
-	 * @param string $shareType
-	 *
-	 * @since 14.0.0
-	 */
-	public function removeCloudFederationProvider($shareType);
+    /**
+     * remove cloud federation provider
+     *
+     * @param string $shareType
+     *
+     * @since 14.0.0
+     */
+    public function removeCloudFederationProvider($shareType);
 
-	/**
-	 * get a list of all cloudFederationProviders
-	 *
-	 * @return array [id => ['id' => $id, 'displayName' => $displayName, 'callback' => callback]]
-	 *
-	 * @since 14.0.0
-	 */
-	public function getAllCloudFederationProviders();
+    /**
+     * get a list of all cloudFederationProviders
+     *
+     * @return array [id => ['id' => $id, 'displayName' => $displayName, 'callback' => callback]]
+     *
+     * @since 14.0.0
+     */
+    public function getAllCloudFederationProviders();
 
-	/**
-	 * get a specific cloud federation provider
-	 *
-	 * @param string $shareType
-	 * @return ICloudFederationProvider
-	 * @throws Exceptions\ProviderDoesNotExistsException;
-	 *
-	 * @since 14.0.0
-	 */
-	public function getCloudFederationProvider($shareType);
+    /**
+     * get a specific cloud federation provider
+     *
+     * @param string $shareType
+     * @return ICloudFederationProvider
+     * @throws Exceptions\ProviderDoesNotExistsException;
+     *
+     * @since 14.0.0
+     */
+    public function getCloudFederationProvider($shareType);
 
-	/**
-	 * send federated share
-	 *
-	 * @param ICloudFederationShare $share
-	 * @return bool
-	 *
-	 * @since 14.0.0
-	 */
-	public function sendShare(ICloudFederationShare $share);
+    /**
+     * send federated share
+     *
+     * @param ICloudFederationShare $share
+     * @return bool
+     *
+     * @since 14.0.0
+     */
+    public function sendShare(ICloudFederationShare $share);
 
-	/**
-	 * send notification about existing share
-	 *
-	 * @param string $url
-	 * @param ICloudFederationNotification $notification
-	 * @return mixed
-	 *
-	 * @since 14.0.0
-	 */
-	public function sendNotification($url, ICloudFederationNotification $notification);
+    /**
+     * send notification about existing share
+     *
+     * @param string $url
+     * @param ICloudFederationNotification $notification
+     * @return mixed
+     *
+     * @since 14.0.0
+     */
+    public function sendNotification($url, ICloudFederationNotification $notification);
 
-	/**
-	 * check if the new cloud federation API is ready to be used
-	 *
-	 * @return bool
-	 *
-	 * @since 14.0.0
-	 */
-	public function isReady();
+    /**
+     * check if the new cloud federation API is ready to be used
+     *
+     * @return bool
+     *
+     * @since 14.0.0
+     */
+    public function isReady();
 
 
 }

apps/federatedfilesharing/lib/AppInfo/Application.php

Indentation +102 added lines, -102 removed lines

@@ -39,114 +39,114 @@
 
 class Application extends App {
 
-	/** @var FederatedShareProvider */
-	protected $federatedShareProvider;
+    /** @var FederatedShareProvider */
+    protected $federatedShareProvider;
 
-	public function __construct() {
-		parent::__construct('federatedfilesharing');
+    public function __construct() {
+        parent::__construct('federatedfilesharing');
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$cloudFederationManager = $server->getCloudFederationProviderManager();
-		$cloudFederationManager->addCloudFederationProvider('file',
-			'Federated Files Sharing',
-			function() use ($container) {
-				$server = $container->getServer();
-				return new CloudFederationProviderFiles(
-					$server->getAppManager(),
-					$server->query(FederatedShareProvider::class),
-					$server->query(AddressHandler::class),
-					$server->getLogger(),
-					$server->getUserManager(),
-					$server->getCloudIdManager(),
-					$server->getActivityManager(),
-					$server->getNotificationManager(),
-					$server->getURLGenerator(),
-					$server->getCloudFederationFactory(),
-					$server->getCloudFederationProviderManager(),
-					$server->getDatabaseConnection()
-				);
-			});
+        $cloudFederationManager = $server->getCloudFederationProviderManager();
+        $cloudFederationManager->addCloudFederationProvider('file',
+            'Federated Files Sharing',
+            function() use ($container) {
+                $server = $container->getServer();
+                return new CloudFederationProviderFiles(
+                    $server->getAppManager(),
+                    $server->query(FederatedShareProvider::class),
+                    $server->query(AddressHandler::class),
+                    $server->getLogger(),
+                    $server->getUserManager(),
+                    $server->getCloudIdManager(),
+                    $server->getActivityManager(),
+                    $server->getNotificationManager(),
+                    $server->getURLGenerator(),
+                    $server->getCloudFederationFactory(),
+                    $server->getCloudFederationProviderManager(),
+                    $server->getDatabaseConnection()
+                );
+            });
 
-		$container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
-			$addressHandler = new AddressHandler(
-				$server->getURLGenerator(),
-				$server->getL10N('federatedfilesharing'),
-				$server->getCloudIdManager()
-			);
-			$notification = new Notifications(
-				$addressHandler,
-				$server->getHTTPClientService(),
-				$server->query(\OCP\OCS\IDiscoveryService::class),
-				\OC::$server->getJobList(),
-				\OC::$server->getCloudFederationProviderManager(),
-				\OC::$server->getCloudFederationFactory()
-			);
-			return new RequestHandlerController(
-				$c->query('AppName'),
-				$server->getRequest(),
-				$this->getFederatedShareProvider(),
-				$server->getDatabaseConnection(),
-				$server->getShareManager(),
-				$notification,
-				$addressHandler,
-				$server->getUserManager(),
-				$server->getCloudIdManager(),
-				$server->getLogger(),
-				$server->getCloudFederationFactory(),
-				$server->getCloudFederationProviderManager()
-			);
-		});
-	}
+        $container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
+            $addressHandler = new AddressHandler(
+                $server->getURLGenerator(),
+                $server->getL10N('federatedfilesharing'),
+                $server->getCloudIdManager()
+            );
+            $notification = new Notifications(
+                $addressHandler,
+                $server->getHTTPClientService(),
+                $server->query(\OCP\OCS\IDiscoveryService::class),
+                \OC::$server->getJobList(),
+                \OC::$server->getCloudFederationProviderManager(),
+                \OC::$server->getCloudFederationFactory()
+            );
+            return new RequestHandlerController(
+                $c->query('AppName'),
+                $server->getRequest(),
+                $this->getFederatedShareProvider(),
+                $server->getDatabaseConnection(),
+                $server->getShareManager(),
+                $notification,
+                $addressHandler,
+                $server->getUserManager(),
+                $server->getCloudIdManager(),
+                $server->getLogger(),
+                $server->getCloudFederationFactory(),
+                $server->getCloudFederationProviderManager()
+            );
+        });
+    }
 
-	/**
-	 * get instance of federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	public function getFederatedShareProvider() {
-		if ($this->federatedShareProvider === null) {
-			$this->initFederatedShareProvider();
-		}
-		return $this->federatedShareProvider;
-	}
+    /**
+     * get instance of federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    public function getFederatedShareProvider() {
+        if ($this->federatedShareProvider === null) {
+            $this->initFederatedShareProvider();
+        }
+        return $this->federatedShareProvider;
+    }
 
-	/**
-	 * initialize federated share provider
-	 */
-	protected function initFederatedShareProvider() {
-		$c = $this->getContainer();
-		$addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
-			\OC::$server->getURLGenerator(),
-			\OC::$server->getL10N('federatedfilesharing'),
-			\OC::$server->getCloudIdManager()
-		);
-		$notifications = new \OCA\FederatedFileSharing\Notifications(
-			$addressHandler,
-			\OC::$server->getHTTPClientService(),
-			\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
-			\OC::$server->getJobList(),
-			\OC::$server->getCloudFederationProviderManager(),
-			\OC::$server->getCloudFederationFactory()
-		);
-		$tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
-			\OC::$server->getSecureRandom()
-		);
+    /**
+     * initialize federated share provider
+     */
+    protected function initFederatedShareProvider() {
+        $c = $this->getContainer();
+        $addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
+            \OC::$server->getURLGenerator(),
+            \OC::$server->getL10N('federatedfilesharing'),
+            \OC::$server->getCloudIdManager()
+        );
+        $notifications = new \OCA\FederatedFileSharing\Notifications(
+            $addressHandler,
+            \OC::$server->getHTTPClientService(),
+            \OC::$server->query(\OCP\OCS\IDiscoveryService::class),
+            \OC::$server->getJobList(),
+            \OC::$server->getCloudFederationProviderManager(),
+            \OC::$server->getCloudFederationFactory()
+        );
+        $tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
+            \OC::$server->getSecureRandom()
+        );
 
-		$this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
-			\OC::$server->getDatabaseConnection(),
-			$addressHandler,
-			$notifications,
-			$tokenHandler,
-			\OC::$server->getL10N('federatedfilesharing'),
-			\OC::$server->getLogger(),
-			\OC::$server->getLazyRootFolder(),
-			\OC::$server->getConfig(),
-			\OC::$server->getUserManager(),
-			\OC::$server->getCloudIdManager(),
-			$c->query(IConfig::class)
-		);
-	}
+        $this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
+            \OC::$server->getDatabaseConnection(),
+            $addressHandler,
+            $notifications,
+            $tokenHandler,
+            \OC::$server->getL10N('federatedfilesharing'),
+            \OC::$server->getLogger(),
+            \OC::$server->getLazyRootFolder(),
+            \OC::$server->getConfig(),
+            \OC::$server->getUserManager(),
+            \OC::$server->getCloudIdManager(),
+            $c->query(IConfig::class)
+        );
+    }
 
 }