implement receiving of federated shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
parent
5cfe20675d
commit
21e64ec7f4
|
@ -33,6 +33,7 @@ use OCA\FederatedFileSharing\Controller\RequestHandlerController;
|
||||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
use OCA\FederatedFileSharing\Notifications;
|
use OCA\FederatedFileSharing\Notifications;
|
||||||
use OCA\FederatedFileSharing\OCM\CloudFederationProvider;
|
use OCA\FederatedFileSharing\OCM\CloudFederationProvider;
|
||||||
|
use OCA\FederatedFileSharing\OCM\CloudFederationProviderFiles;
|
||||||
use OCP\AppFramework\App;
|
use OCP\AppFramework\App;
|
||||||
use OCP\GlobalScale\IConfig;
|
use OCP\GlobalScale\IConfig;
|
||||||
|
|
||||||
|
@ -51,7 +52,18 @@ class Application extends App {
|
||||||
$cloudFederationManager->addCloudFederationProvider('file',
|
$cloudFederationManager->addCloudFederationProvider('file',
|
||||||
'Federated Files Sharing',
|
'Federated Files Sharing',
|
||||||
function() use ($container) {
|
function() use ($container) {
|
||||||
return new CloudFederationProvider('file');
|
$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()
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
$container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
|
$container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
|
||||||
|
@ -76,7 +88,9 @@ class Application extends App {
|
||||||
$addressHandler,
|
$addressHandler,
|
||||||
$server->getUserManager(),
|
$server->getUserManager(),
|
||||||
$server->getCloudIdManager(),
|
$server->getCloudIdManager(),
|
||||||
$server->getLogger()
|
$server->getLogger(),
|
||||||
|
$server->getCloudFederationFactory(),
|
||||||
|
$server->getCloudFederationProviderManager()
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,10 @@ use OCP\AppFramework\OCS\OCSForbiddenException;
|
||||||
use OCP\AppFramework\OCS\OCSNotFoundException;
|
use OCP\AppFramework\OCS\OCSNotFoundException;
|
||||||
use OCP\AppFramework\OCSController;
|
use OCP\AppFramework\OCSController;
|
||||||
use OCP\Constants;
|
use OCP\Constants;
|
||||||
|
use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
|
||||||
|
use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
use OCP\Federation\ICloudIdManager;
|
use OCP\Federation\ICloudIdManager;
|
||||||
use OCP\Files\NotFoundException;
|
use OCP\Files\NotFoundException;
|
||||||
use OCP\IDBConnection;
|
use OCP\IDBConnection;
|
||||||
|
@ -78,6 +82,12 @@ class RequestHandlerController extends OCSController {
|
||||||
/** @var ILogger */
|
/** @var ILogger */
|
||||||
private $logger;
|
private $logger;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory */
|
||||||
|
private $cloudFederationFactory;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Server2Server constructor.
|
* Server2Server constructor.
|
||||||
*
|
*
|
||||||
|
@ -90,6 +100,9 @@ class RequestHandlerController extends OCSController {
|
||||||
* @param AddressHandler $addressHandler
|
* @param AddressHandler $addressHandler
|
||||||
* @param IUserManager $userManager
|
* @param IUserManager $userManager
|
||||||
* @param ICloudIdManager $cloudIdManager
|
* @param ICloudIdManager $cloudIdManager
|
||||||
|
* @param ILogger $logger
|
||||||
|
* @param ICloudFederationFactory $cloudFederationFactory
|
||||||
|
* @param ICloudFederationProviderManager $cloudFederationProviderManager
|
||||||
*/
|
*/
|
||||||
public function __construct($appName,
|
public function __construct($appName,
|
||||||
IRequest $request,
|
IRequest $request,
|
||||||
|
@ -100,7 +113,9 @@ class RequestHandlerController extends OCSController {
|
||||||
AddressHandler $addressHandler,
|
AddressHandler $addressHandler,
|
||||||
IUserManager $userManager,
|
IUserManager $userManager,
|
||||||
ICloudIdManager $cloudIdManager,
|
ICloudIdManager $cloudIdManager,
|
||||||
ILogger $logger
|
ILogger $logger,
|
||||||
|
ICloudFederationFactory $cloudFederationFactory,
|
||||||
|
ICloudFederationProviderManager $cloudFederationProviderManager
|
||||||
) {
|
) {
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
|
|
||||||
|
@ -112,6 +127,8 @@ class RequestHandlerController extends OCSController {
|
||||||
$this->userManager = $userManager;
|
$this->userManager = $userManager;
|
||||||
$this->cloudIdManager = $cloudIdManager;
|
$this->cloudIdManager = $cloudIdManager;
|
||||||
$this->logger = $logger;
|
$this->logger = $logger;
|
||||||
|
$this->cloudFederationFactory = $cloudFederationFactory;
|
||||||
|
$this->cloudFederationProviderManager = $cloudFederationProviderManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -125,10 +142,6 @@ class RequestHandlerController extends OCSController {
|
||||||
*/
|
*/
|
||||||
public function createShare() {
|
public function createShare() {
|
||||||
|
|
||||||
if (!$this->isS2SEnabled(true)) {
|
|
||||||
throw new OCSException('Server does not support federated cloud sharing', 503);
|
|
||||||
}
|
|
||||||
|
|
||||||
$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
|
$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
|
||||||
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
||||||
$name = isset($_POST['name']) ? $_POST['name'] : null;
|
$name = isset($_POST['name']) ? $_POST['name'] : null;
|
||||||
|
@ -139,41 +152,6 @@ class RequestHandlerController extends OCSController {
|
||||||
$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
|
$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
|
||||||
$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
|
$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
|
||||||
|
|
||||||
if ($remote && $token && $name && $owner && $remoteId && $shareWith) {
|
|
||||||
|
|
||||||
if (!\OCP\Util::isValidFileName($name)) {
|
|
||||||
throw new OCSException('The mountpoint name contains invalid characters.', 400);
|
|
||||||
}
|
|
||||||
|
|
||||||
// FIXME this should be a method in the user management instead
|
|
||||||
$this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
|
|
||||||
\OCP\Util::emitHook(
|
|
||||||
'\OCA\Files_Sharing\API\Server2Server',
|
|
||||||
'preLoginNameUsedAsUserName',
|
|
||||||
array('uid' => &$shareWith)
|
|
||||||
);
|
|
||||||
$this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
|
|
||||||
|
|
||||||
if (!\OC::$server->getUserManager()->userExists($shareWith)) {
|
|
||||||
throw new OCSException('User does not exists', 400);
|
|
||||||
}
|
|
||||||
|
|
||||||
\OC_Util::setupFS($shareWith);
|
|
||||||
|
|
||||||
$externalManager = new \OCA\Files_Sharing\External\Manager(
|
|
||||||
\OC::$server->getDatabaseConnection(),
|
|
||||||
\OC\Files\Filesystem::getMountManager(),
|
|
||||||
\OC\Files\Filesystem::getLoader(),
|
|
||||||
\OC::$server->getHTTPClientService(),
|
|
||||||
\OC::$server->getNotificationManager(),
|
|
||||||
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
|
||||||
$shareWith
|
|
||||||
);
|
|
||||||
|
|
||||||
try {
|
|
||||||
$externalManager->addShare($remote, $token, '', $name, $owner, false, $shareWith, $remoteId);
|
|
||||||
$shareId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share_external');
|
|
||||||
|
|
||||||
if ($ownerFederatedId === null) {
|
if ($ownerFederatedId === null) {
|
||||||
$ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
|
$ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
|
||||||
}
|
}
|
||||||
|
@ -183,48 +161,32 @@ class RequestHandlerController extends OCSController {
|
||||||
$sharedByFederatedId = $ownerFederatedId;
|
$sharedByFederatedId = $ownerFederatedId;
|
||||||
}
|
}
|
||||||
|
|
||||||
$event = \OC::$server->getActivityManager()->generateEvent();
|
$share = $this->cloudFederationFactory->getCloudFederationShare(
|
||||||
$event->setApp('files_sharing')
|
$shareWith,
|
||||||
->setType('remote_share')
|
$name,
|
||||||
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
|
'',
|
||||||
->setAffectedUser($shareWith)
|
$remoteId,
|
||||||
->setObject('remote_share', (int)$shareId, $name);
|
$ownerFederatedId,
|
||||||
\OC::$server->getActivityManager()->publish($event);
|
$owner,
|
||||||
|
$sharedByFederatedId,
|
||||||
|
$sharedBy,
|
||||||
|
['name' => 'webdav', 'options' => ['access_token' => $token]],
|
||||||
|
'user',
|
||||||
|
'file'
|
||||||
|
);
|
||||||
|
|
||||||
$urlGenerator = \OC::$server->getURLGenerator();
|
try {
|
||||||
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
$notificationManager = \OC::$server->getNotificationManager();
|
$provider->shareReceived($share);
|
||||||
$notification = $notificationManager->createNotification();
|
} catch (ProviderDoesNotExistsException $e) {
|
||||||
$notification->setApp('files_sharing')
|
throw new OCSException('Server does not support federated cloud sharing', 503);
|
||||||
->setUser($shareWith)
|
} catch (ProviderCouldNotAddShareException $e) {
|
||||||
->setDateTime(new \DateTime())
|
throw new OCSException($e->getMessage(), $e->getCode());
|
||||||
->setObject('remote_share', $shareId)
|
|
||||||
->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/')]);
|
|
||||||
|
|
||||||
$declineAction = $notification->createAction();
|
|
||||||
$declineAction->setLabel('decline')
|
|
||||||
->setLink($urlGenerator->getAbsoluteURL($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($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
|
|
||||||
$notification->addAction($acceptAction);
|
|
||||||
|
|
||||||
$notificationManager->notify($notification);
|
|
||||||
|
|
||||||
return new Http\DataResponse();
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$this->logger->logException($e, [
|
|
||||||
'message' => 'Server can not add remote share.',
|
|
||||||
'level' => ILogger::ERROR,
|
|
||||||
'app' => 'files_sharing'
|
|
||||||
]);
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
throw new OCSException('server can not add remote share, missing parameter', 400);
|
return new Http\DataResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
namespace OCA\FederatedFileSharing;
|
namespace OCA\FederatedFileSharing;
|
||||||
|
|
||||||
use OC\Share20\Share;
|
use OC\Share20\Share;
|
||||||
use OCA\FederatedFileSharing\OCM\CloudFederationProvider;
|
|
||||||
use OCP\Federation\ICloudIdManager;
|
use OCP\Federation\ICloudIdManager;
|
||||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||||
use OCP\Files\Folder;
|
use OCP\Files\Folder;
|
||||||
|
@ -92,9 +91,6 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
/** @var \OCP\GlobalScale\IConfig */
|
/** @var \OCP\GlobalScale\IConfig */
|
||||||
private $gsConfig;
|
private $gsConfig;
|
||||||
|
|
||||||
/** @var CloudFederationProvider */
|
|
||||||
private $cloudFederationProvider;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DefaultShareProvider constructor.
|
* DefaultShareProvider constructor.
|
||||||
*
|
*
|
||||||
|
@ -109,7 +105,6 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
* @param IUserManager $userManager
|
* @param IUserManager $userManager
|
||||||
* @param ICloudIdManager $cloudIdManager
|
* @param ICloudIdManager $cloudIdManager
|
||||||
* @param \OCP\GlobalScale\IConfig $globalScaleConfig
|
* @param \OCP\GlobalScale\IConfig $globalScaleConfig
|
||||||
* @param CloudFederationProvider $cloudFederationProvider
|
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
IDBConnection $connection,
|
IDBConnection $connection,
|
||||||
|
@ -122,8 +117,7 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
IConfig $config,
|
IConfig $config,
|
||||||
IUserManager $userManager,
|
IUserManager $userManager,
|
||||||
ICloudIdManager $cloudIdManager,
|
ICloudIdManager $cloudIdManager,
|
||||||
\OCP\GlobalScale\IConfig $globalScaleConfig,
|
\OCP\GlobalScale\IConfig $globalScaleConfig
|
||||||
CloudFederationProvider $cloudFederationProvider
|
|
||||||
) {
|
) {
|
||||||
$this->dbConnection = $connection;
|
$this->dbConnection = $connection;
|
||||||
$this->addressHandler = $addressHandler;
|
$this->addressHandler = $addressHandler;
|
||||||
|
@ -136,8 +130,6 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
$this->userManager = $userManager;
|
$this->userManager = $userManager;
|
||||||
$this->cloudIdManager = $cloudIdManager;
|
$this->cloudIdManager = $cloudIdManager;
|
||||||
$this->gsConfig = $globalScaleConfig;
|
$this->gsConfig = $globalScaleConfig;
|
||||||
$this->cloudFederationProvider = $cloudFederationProvider;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,83 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OCA\FederatedFileSharing\OCM;
|
|
||||||
|
|
||||||
use OCP\Federation\ICloudFederationFactory;
|
|
||||||
use OCP\Federation\ICloudFederationProvider;
|
|
||||||
use OCP\Federation\ICloudFederationShare;
|
|
||||||
|
|
||||||
class CloudFederationProvider implements ICloudFederationProvider {
|
|
||||||
|
|
||||||
/** @var string */
|
|
||||||
private $shareType;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* CloudFederationProvider constructor.
|
|
||||||
*
|
|
||||||
* @param string $shareType
|
|
||||||
*/
|
|
||||||
public function __construct($shareType) {
|
|
||||||
$this->shareType = $shareType;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function getShareType() {
|
|
||||||
return $this->shareType;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* send new share to another server
|
|
||||||
*
|
|
||||||
* @since 14.0.0
|
|
||||||
*/
|
|
||||||
public function sendShare() {
|
|
||||||
// TODO: Implement sendShare() method.
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* share received from another server
|
|
||||||
*
|
|
||||||
* @param ICloudFederationShare $share
|
|
||||||
* @return string provider specific unique ID of the share
|
|
||||||
*
|
|
||||||
* @since 14.0.0
|
|
||||||
*/
|
|
||||||
public function shareReceived(ICloudFederationShare $share) {
|
|
||||||
// TODO: Implement shareReceived() method.
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* notification received from another server
|
|
||||||
*
|
|
||||||
* @param string $id unique ID of a already existing share
|
|
||||||
* @param array $notification provider specific notification
|
|
||||||
*
|
|
||||||
* @throws \OCP\Federation\Exceptions\ShareNotFoundException
|
|
||||||
*
|
|
||||||
* @since 14.0.0
|
|
||||||
*/
|
|
||||||
public function notificationReceived($id, $notification) {
|
|
||||||
// TODO: Implement notificationReceived() method.
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,272 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\FederatedFileSharing\OCM;
|
||||||
|
|
||||||
|
use OC\AppFramework\Http;
|
||||||
|
use OCA\Files_Sharing\Activity\Providers\RemoteShares;
|
||||||
|
use OCA\FederatedFileSharing\AddressHandler;
|
||||||
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
|
use OCP\Activity\IManager as IActivityManager;
|
||||||
|
use OCP\App\IAppManager;
|
||||||
|
use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
|
||||||
|
use OCP\Federation\ICloudFederationProvider;
|
||||||
|
use OCP\Federation\ICloudFederationShare;
|
||||||
|
use OCP\Federation\ICloudIdManager;
|
||||||
|
use OCP\ILogger;
|
||||||
|
use OCP\IURLGenerator;
|
||||||
|
use OCP\IUserManager;
|
||||||
|
use OCP\Notification\IManager as INotificationManager;
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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
|
||||||
|
*/
|
||||||
|
public function __construct(IAppManager $appManager,
|
||||||
|
FederatedShareProvider $federatedShareProvider,
|
||||||
|
AddressHandler $addressHandler,
|
||||||
|
ILogger $logger,
|
||||||
|
IUserManager $userManager,
|
||||||
|
ICloudIdManager $cloudIdManager,
|
||||||
|
IActivityManager $activityManager,
|
||||||
|
INotificationManager $notificationManager,
|
||||||
|
IURLGenerator $urlGenerator
|
||||||
|
) {
|
||||||
|
$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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getShareType() {
|
||||||
|
return 'file';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* send new share to another server
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function sendShare() {
|
||||||
|
// TODO: Implement sendShare() method.
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 = isset($protocol['options']['access_token']) ? $protocol['options']['access_token'] : null;
|
||||||
|
$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 (!\OCP\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']);
|
||||||
|
\OCP\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(),
|
||||||
|
\OC\Files\Filesystem::getMountManager(),
|
||||||
|
\OC\Files\Filesystem::getLoader(),
|
||||||
|
\OC::$server->getHTTPClientService(),
|
||||||
|
\OC::$server->getNotificationManager(),
|
||||||
|
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
|
$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' => \OCP\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 $id unique ID of a already existing share
|
||||||
|
* @param array $notification provider specific notification
|
||||||
|
*
|
||||||
|
* @throws \OCP\Federation\Exceptions\ShareNotFoundException
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function notificationReceived($id, $notification) {
|
||||||
|
// TODO: Implement notificationReceived() method.
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -22,7 +22,13 @@
|
||||||
namespace OCP\Federation\Exceptions;
|
namespace OCP\Federation\Exceptions;
|
||||||
|
|
||||||
use OC\HintException;
|
use OC\HintException;
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
|
|
||||||
class ProviderCouldNotAddShareException extends HintException {
|
class ProviderCouldNotAddShareException extends HintException {
|
||||||
|
|
||||||
|
public function __construct($message, $hint = '', $code = Http::STATUS_BAD_REQUEST, \Exception $previous = null) {
|
||||||
|
parent::__construct($message, $hint, $code, $previous);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
namespace OCP\Federation;
|
namespace OCP\Federation;
|
||||||
|
|
||||||
|
use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
|
||||||
use OCP\Federation\Exceptions\ShareNotFoundException;
|
use OCP\Federation\Exceptions\ShareNotFoundException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -35,17 +36,12 @@ use OCP\Federation\Exceptions\ShareNotFoundException;
|
||||||
|
|
||||||
interface ICloudFederationProvider {
|
interface ICloudFederationProvider {
|
||||||
|
|
||||||
/**
|
|
||||||
* ICloudFederationProvider constructor.
|
|
||||||
*
|
|
||||||
* @param $shareType define the share type, handled by this provider
|
|
||||||
*/
|
|
||||||
public function __construct($shareType);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get the name of the share type, handled by this provider
|
* get the name of the share type, handled by this provider
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
*/
|
*/
|
||||||
public function getShareType();
|
public function getShareType();
|
||||||
|
|
||||||
|
@ -62,6 +58,8 @@ interface ICloudFederationProvider {
|
||||||
* @param ICloudFederationShare $share
|
* @param ICloudFederationShare $share
|
||||||
* @return string provider specific unique ID of the share
|
* @return string provider specific unique ID of the share
|
||||||
*
|
*
|
||||||
|
* @throws ProviderCouldNotAddShareException
|
||||||
|
*
|
||||||
* @since 14.0.0
|
* @since 14.0.0
|
||||||
*/
|
*/
|
||||||
public function shareReceived(ICloudFederationShare $share);
|
public function shareReceived(ICloudFederationShare $share);
|
||||||
|
|
Loading…
Reference in New Issue