diff options
author | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-09 15:09:50 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-19 09:48:00 +0200 |
commit | 0c727f175509ccfdec87dc69fd52af60cf2d6b94 (patch) | |
tree | f3e43242a9d5713ff34bf17b5b4f196ddb4bb651 /apps/federation/backgroundjob | |
parent | 7ca5b35379144d868a36f10c237c78de56f4ed5a (diff) | |
download | nextcloud-server-0c727f175509ccfdec87dc69fd52af60cf2d6b94.tar.gz nextcloud-server-0c727f175509ccfdec87dc69fd52af60cf2d6b94.zip |
Move federation code to PSR-4
Diffstat (limited to 'apps/federation/backgroundjob')
-rw-r--r-- | apps/federation/backgroundjob/getsharedsecret.php | 200 | ||||
-rw-r--r-- | apps/federation/backgroundjob/requestsharedsecret.php | 184 |
2 files changed, 0 insertions, 384 deletions
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php deleted file mode 100644 index 66ab082c1a2..00000000000 --- a/apps/federation/backgroundjob/getsharedsecret.php +++ /dev/null @@ -1,200 +0,0 @@ -<?php -/** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - - -namespace OCA\Federation\BackgroundJob; - -use GuzzleHttp\Exception\ClientException; -use OC\BackgroundJob\JobList; -use OC\BackgroundJob\Job; -use OCA\Federation\DbHandler; -use OCA\Federation\TrustedServers; -use OCP\AppFramework\Http; -use OCP\BackgroundJob\IJobList; -use OCP\Http\Client\IClient; -use OCP\Http\Client\IResponse; -use OCP\ILogger; -use OCP\IURLGenerator; - -/** - * Class GetSharedSecret - * - * request shared secret from remote ownCloud - * - * @package OCA\Federation\Backgroundjob - */ -class GetSharedSecret extends Job{ - - /** @var IClient */ - private $httpClient; - - /** @var IJobList */ - private $jobList; - - /** @var IURLGenerator */ - private $urlGenerator; - - /** @var TrustedServers */ - private $trustedServers; - - /** @var DbHandler */ - private $dbHandler; - - /** @var ILogger */ - private $logger; - - /** @var bool */ - protected $retainJob = false; - - private $endPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret?format=json'; - - /** - * RequestSharedSecret constructor. - * - * @param IClient $httpClient - * @param IURLGenerator $urlGenerator - * @param IJobList $jobList - * @param TrustedServers $trustedServers - * @param ILogger $logger - * @param DbHandler $dbHandler - */ - public function __construct( - IClient $httpClient = null, - IURLGenerator $urlGenerator = null, - IJobList $jobList = null, - TrustedServers $trustedServers = null, - ILogger $logger = null, - DbHandler $dbHandler = null - ) { - $this->logger = $logger ? $logger : \OC::$server->getLogger(); - $this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient(); - $this->jobList = $jobList ? $jobList : \OC::$server->getJobList(); - $this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator(); - $this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation')); - if ($trustedServers) { - $this->trustedServers = $trustedServers; - } else { - $this->trustedServers = new TrustedServers( - $this->dbHandler, - \OC::$server->getHTTPClientService(), - $this->logger, - $this->jobList, - \OC::$server->getSecureRandom(), - \OC::$server->getConfig(), - \OC::$server->getEventDispatcher() - ); - } - } - - /** - * run the job, then remove it from the joblist - * - * @param JobList $jobList - * @param ILogger $logger - */ - public function execute($jobList, ILogger $logger = null) { - $target = $this->argument['url']; - // only execute if target is still in the list of trusted domains - if ($this->trustedServers->isTrustedServer($target)) { - $this->parentExecute($jobList, $logger); - } - - if (!$this->retainJob) { - $jobList->remove($this, $this->argument); - } - } - - /** - * call execute() method of parent - * - * @param JobList $jobList - * @param ILogger $logger - */ - protected function parentExecute($jobList, $logger) { - parent::execute($jobList, $logger); - } - - protected function run($argument) { - $target = $argument['url']; - $source = $this->urlGenerator->getAbsoluteURL('/'); - $source = rtrim($source, '/'); - $token = $argument['token']; - - $result = null; - try { - $result = $this->httpClient->get( - $target . $this->endPoint, - [ - 'query' => - [ - 'url' => $source, - 'token' => $token - ], - 'timeout' => 3, - 'connect_timeout' => 3, - ] - ); - - $status = $result->getStatusCode(); - - } catch (ClientException $e) { - $status = $e->getCode(); - if ($status === Http::STATUS_FORBIDDEN) { - $this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']); - } else { - $this->logger->logException($e, ['app' => 'federation']); - } - } catch (\Exception $e) { - $status = Http::STATUS_INTERNAL_SERVER_ERROR; - $this->logger->logException($e, ['app' => 'federation']); - } - - // if we received a unexpected response we try again later - if ( - $status !== Http::STATUS_OK - && $status !== Http::STATUS_FORBIDDEN - ) { - $this->retainJob = true; - } else { - // reset token if we received a valid response - $this->dbHandler->addToken($target, ''); - } - - if ($status === Http::STATUS_OK && $result instanceof IResponse) { - $body = $result->getBody(); - $result = json_decode($body, true); - if (isset($result['ocs']['data']['sharedSecret'])) { - $this->trustedServers->addSharedSecret( - $target, - $result['ocs']['data']['sharedSecret'] - ); - } else { - $this->logger->error( - 'remote server "' . $target . '"" does not return a valid shared secret', - ['app' => 'federation'] - ); - $this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE); - } - } - - } -} diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php deleted file mode 100644 index 040e8e1d8e2..00000000000 --- a/apps/federation/backgroundjob/requestsharedsecret.php +++ /dev/null @@ -1,184 +0,0 @@ -<?php -/** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Robin Appelman <icewind@owncloud.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - - -namespace OCA\Federation\BackgroundJob; - - -use GuzzleHttp\Exception\ClientException; -use OC\BackgroundJob\JobList; -use OC\BackgroundJob\Job; -use OCA\Federation\DbHandler; -use OCA\Federation\TrustedServers; -use OCP\AppFramework\Http; -use OCP\BackgroundJob\IJobList; -use OCP\Http\Client\IClient; -use OCP\ILogger; -use OCP\IURLGenerator; - -/** - * Class RequestSharedSecret - * - * Ask remote ownCloud to request a sharedSecret from this server - * - * @package OCA\Federation\Backgroundjob - */ -class RequestSharedSecret extends Job { - - /** @var IClient */ - private $httpClient; - - /** @var IJobList */ - private $jobList; - - /** @var IURLGenerator */ - private $urlGenerator; - - /** @var DbHandler */ - private $dbHandler; - - /** @var TrustedServers */ - private $trustedServers; - - private $endPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret?format=json'; - - /** @var ILogger */ - private $logger; - - /** @var bool */ - protected $retainJob = false; - - /** - * RequestSharedSecret constructor. - * - * @param IClient $httpClient - * @param IURLGenerator $urlGenerator - * @param IJobList $jobList - * @param TrustedServers $trustedServers - * @param DbHandler $dbHandler - */ - public function __construct( - IClient $httpClient = null, - IURLGenerator $urlGenerator = null, - IJobList $jobList = null, - TrustedServers $trustedServers = null, - DbHandler $dbHandler = null - ) { - $this->httpClient = $httpClient ? $httpClient : \OC::$server->getHTTPClientService()->newClient(); - $this->jobList = $jobList ? $jobList : \OC::$server->getJobList(); - $this->urlGenerator = $urlGenerator ? $urlGenerator : \OC::$server->getURLGenerator(); - $this->dbHandler = $dbHandler ? $dbHandler : new DbHandler(\OC::$server->getDatabaseConnection(), \OC::$server->getL10N('federation')); - $this->logger = \OC::$server->getLogger(); - if ($trustedServers) { - $this->trustedServers = $trustedServers; - } else { - $this->trustedServers = new TrustedServers( - $this->dbHandler, - \OC::$server->getHTTPClientService(), - $this->logger, - $this->jobList, - \OC::$server->getSecureRandom(), - \OC::$server->getConfig(), - \OC::$server->getEventDispatcher() - ); - } - } - - - /** - * run the job, then remove it from the joblist - * - * @param JobList $jobList - * @param ILogger $logger - */ - public function execute($jobList, ILogger $logger = null) { - $target = $this->argument['url']; - // only execute if target is still in the list of trusted domains - if ($this->trustedServers->isTrustedServer($target)) { - $this->parentExecute($jobList, $logger); - } - - if (!$this->retainJob) { - $jobList->remove($this, $this->argument); - } - } - - /** - * call execute() method of parent - * - * @param JobList $jobList - * @param ILogger $logger - */ - protected function parentExecute($jobList, $logger) { - parent::execute($jobList, $logger); - } - - protected function run($argument) { - - $target = $argument['url']; - $source = $this->urlGenerator->getAbsoluteURL('/'); - $source = rtrim($source, '/'); - $token = $argument['token']; - - try { - $result = $this->httpClient->post( - $target . $this->endPoint, - [ - 'body' => [ - 'url' => $source, - 'token' => $token, - ], - 'timeout' => 3, - 'connect_timeout' => 3, - ] - ); - - $status = $result->getStatusCode(); - - } catch (ClientException $e) { - $status = $e->getCode(); - if ($status === Http::STATUS_FORBIDDEN) { - $this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']); - } else { - $this->logger->logException($e, ['app' => 'federation']); - } - } catch (\Exception $e) { - $status = Http::STATUS_INTERNAL_SERVER_ERROR; - $this->logger->logException($e, ['app' => 'federation']); - } - - // if we received a unexpected response we try again later - if ( - $status !== Http::STATUS_OK - && $status !== Http::STATUS_FORBIDDEN - ) { - $this->retainJob = true; - } - - if ($status === Http::STATUS_FORBIDDEN) { - // clear token if remote server refuses to ask for shared secret - $this->dbHandler->addToken($target, ''); - } - - } -} |