nextcloud / server

apps/federatedfilesharing/lib/TokenHandler.php

Indentation +25 added lines, -25 removed lines

@@ -33,30 +33,30 @@
  */
 class TokenHandler {
 
-	const TOKEN_LENGTH = 15;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/**
-	 * TokenHandler constructor.
-	 *
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct(ISecureRandom $secureRandom) {
-		$this->secureRandom = $secureRandom;
-	}
-
-	/**
-	 * generate to token used to authenticate federated shares
-	 *
-	 * @return string
-	 */
-	public function generateToken() {
-		$token = $this->secureRandom->generate(
-			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-		return $token;
-	}
+    const TOKEN_LENGTH = 15;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /**
+     * TokenHandler constructor.
+     *
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct(ISecureRandom $secureRandom) {
+        $this->secureRandom = $secureRandom;
+    }
+
+    /**
+     * generate to token used to authenticate federated shares
+     *
+     * @return string
+     */
+    public function generateToken() {
+        $token = $this->secureRandom->generate(
+            self::TOKEN_LENGTH,
+            ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+        return $token;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	public function generateToken() {
 		$token = $this->secureRandom->generate(
 			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+			ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
 		return $token;
 	}
 

apps/federation/templates/settings-admin.php

Indentation +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
 				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
-				) { ?>
+                } elseif(
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+                ) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>
 					<span class="status error"></span>

Spacing +6 added lines, -6 removed lines

@@ -11,19 +11,19 @@
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if ($_['autoAddServers']) p('checked'); ?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 
 	<ul id="listOfTrustedServers">
-		<?php foreach($_['trustedServers'] as $trustedServer) { ?>
+		<?php foreach ($_['trustedServers'] as $trustedServer) { ?>
 			<li id="<?php p($trustedServer['id']); ?>">
-				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
+				<?php if ((int) $trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+				} elseif (
+					(int) $trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+					(int) $trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
 				) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>

Braces +4 added lines, -1 removed lines

@@ -11,7 +11,10 @@
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) {
+    p('checked');
+}
+?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 

apps/federation/lib/Controller/OCSAuthAPIController.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
  *
  * @package OCA\Federation\Controller
  */
-class OCSAuthAPIController extends OCSController{
+class OCSAuthAPIController extends OCSController {
 
 	/** @var ISecureRandom  */
 	private $secureRandom;
@@ -103,7 +103,7 @@ 
 	 */
 	public function requestSharedSecret($url, $token) {
 		if ($this->trustedServers->isTrustedServer($url) === false) {
-			$this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret', ['app' => 'federation']);
+			$this->logger->error('remote server not trusted ('.$url.') while requesting shared secret', ['app' => 'federation']);
 			throw new OCSForbiddenException();
 		}
 
@@ -112,7 +112,7 @@ 
 		$localToken = $this->dbHandler->getToken($url);
 		if (strcmp($localToken, $token) > 0) {
 			$this->logger->info(
-				'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.',
+				'remote server ('.$url.') presented lower token. We will initiate the exchange of the shared secret.',
 				['app' => 'federation']
 			);
 			throw new OCSForbiddenException();
@@ -151,14 +151,14 @@ 
 	 */
 	public function getSharedSecret($url, $token) {
 		if ($this->trustedServers->isTrustedServer($url) === false) {
-			$this->logger->error('remote server not trusted (' . $url . ') while getting shared secret', ['app' => 'federation']);
+			$this->logger->error('remote server not trusted ('.$url.') while getting shared secret', ['app' => 'federation']);
 			throw new OCSForbiddenException();
 		}
 
 		if ($this->isValidToken($url, $token) === false) {
 			$expectedToken = $this->dbHandler->getToken($url);
 			$this->logger->error(
-				'remote server (' . $url . ') didn\'t send a valid token (got "' . $token . '" but expected "'. $expectedToken . '") while getting shared secret',
+				'remote server ('.$url.') didn\'t send a valid token (got "'.$token.'" but expected "'.$expectedToken.'") while getting shared secret',
 				['app' => 'federation']
 			);
 			throw new OCSForbiddenException();

Indentation +162 added lines, -162 removed lines

@@ -47,166 +47,166 @@
  */
 class OCSAuthAPIController extends OCSController{
 
-	/** @var ISecureRandom  */
-	private $secureRandom;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	/** @var DbHandler */
-	private $dbHandler;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * OCSAuthAPI constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ISecureRandom $secureRandom
-	 * @param IJobList $jobList
-	 * @param TrustedServers $trustedServers
-	 * @param DbHandler $dbHandler
-	 * @param ILogger $logger
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		ISecureRandom $secureRandom,
-		IJobList $jobList,
-		TrustedServers $trustedServers,
-		DbHandler $dbHandler,
-		ILogger $logger,
-		ITimeFactory $timeFactory
-	) {
-		parent::__construct($appName, $request);
-
-		$this->secureRandom = $secureRandom;
-		$this->jobList = $jobList;
-		$this->trustedServers = $trustedServers;
-		$this->dbHandler = $dbHandler;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * request received to ask remote server for a shared secret, for legacy end-points
-	 *
-	 * @param string $url
-	 * @param string $token
-	 * @return Http\DataResponse
-	 * @throws OCSForbiddenException
-	 */
-	public function requestSharedSecretLegacy($url, $token) {
-		return $this->requestSharedSecret($url, $token);
-	}
-
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * create shared secret and return it, for legacy end-points
-	 *
-	 * @param string $url
-	 * @param string $token
-	 * @return Http\DataResponse
-	 * @throws OCSForbiddenException
-	 */
-	public function getSharedSecretLegacy($url, $token) {
-		return $this->getSharedSecret($url, $token);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * request received to ask remote server for a shared secret
-	 *
-	 * @param string $url
-	 * @param string $token
-	 * @return Http\DataResponse
-	 * @throws OCSForbiddenException
-	 */
-	public function requestSharedSecret($url, $token) {
-		if ($this->trustedServers->isTrustedServer($url) === false) {
-			$this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret', ['app' => 'federation']);
-			throw new OCSForbiddenException();
-		}
-
-		// if both server initiated the exchange of the shared secret the greater
-		// token wins
-		$localToken = $this->dbHandler->getToken($url);
-		if (strcmp($localToken, $token) > 0) {
-			$this->logger->info(
-				'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.',
-				['app' => 'federation']
-			);
-			throw new OCSForbiddenException();
-		}
-
-		$this->jobList->add(
-			'OCA\Federation\BackgroundJob\GetSharedSecret',
-			[
-				'url' => $url,
-				'token' => $token,
-				'created' => $this->timeFactory->getTime()
-			]
-		);
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * create shared secret and return it
-	 *
-	 * @param string $url
-	 * @param string $token
-	 * @return Http\DataResponse
-	 * @throws OCSForbiddenException
-	 */
-	public function getSharedSecret($url, $token) {
-		if ($this->trustedServers->isTrustedServer($url) === false) {
-			$this->logger->error('remote server not trusted (' . $url . ') while getting shared secret', ['app' => 'federation']);
-			throw new OCSForbiddenException();
-		}
-
-		if ($this->isValidToken($url, $token) === false) {
-			$expectedToken = $this->dbHandler->getToken($url);
-			$this->logger->error(
-				'remote server (' . $url . ') didn\'t send a valid token (got "' . $token . '" but expected "'. $expectedToken . '") while getting shared secret',
-				['app' => 'federation']
-			);
-			throw new OCSForbiddenException();
-		}
-
-		$sharedSecret = $this->secureRandom->generate(32);
-
-		$this->trustedServers->addSharedSecret($url, $sharedSecret);
-		// reset token after the exchange of the shared secret was successful
-		$this->dbHandler->addToken($url, '');
-
-		return new Http\DataResponse([
-			'sharedSecret' => $sharedSecret
-		]);
-	}
-
-	protected function isValidToken($url, $token) {
-		$storedToken = $this->dbHandler->getToken($url);
-		return hash_equals($storedToken, $token);
-	}
+    /** @var ISecureRandom  */
+    private $secureRandom;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var TrustedServers */
+    private $trustedServers;
+
+    /** @var DbHandler */
+    private $dbHandler;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * OCSAuthAPI constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param ISecureRandom $secureRandom
+     * @param IJobList $jobList
+     * @param TrustedServers $trustedServers
+     * @param DbHandler $dbHandler
+     * @param ILogger $logger
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        ISecureRandom $secureRandom,
+        IJobList $jobList,
+        TrustedServers $trustedServers,
+        DbHandler $dbHandler,
+        ILogger $logger,
+        ITimeFactory $timeFactory
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->secureRandom = $secureRandom;
+        $this->jobList = $jobList;
+        $this->trustedServers = $trustedServers;
+        $this->dbHandler = $dbHandler;
+        $this->logger = $logger;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * request received to ask remote server for a shared secret, for legacy end-points
+     *
+     * @param string $url
+     * @param string $token
+     * @return Http\DataResponse
+     * @throws OCSForbiddenException
+     */
+    public function requestSharedSecretLegacy($url, $token) {
+        return $this->requestSharedSecret($url, $token);
+    }
+
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * create shared secret and return it, for legacy end-points
+     *
+     * @param string $url
+     * @param string $token
+     * @return Http\DataResponse
+     * @throws OCSForbiddenException
+     */
+    public function getSharedSecretLegacy($url, $token) {
+        return $this->getSharedSecret($url, $token);
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * request received to ask remote server for a shared secret
+     *
+     * @param string $url
+     * @param string $token
+     * @return Http\DataResponse
+     * @throws OCSForbiddenException
+     */
+    public function requestSharedSecret($url, $token) {
+        if ($this->trustedServers->isTrustedServer($url) === false) {
+            $this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret', ['app' => 'federation']);
+            throw new OCSForbiddenException();
+        }
+
+        // if both server initiated the exchange of the shared secret the greater
+        // token wins
+        $localToken = $this->dbHandler->getToken($url);
+        if (strcmp($localToken, $token) > 0) {
+            $this->logger->info(
+                'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.',
+                ['app' => 'federation']
+            );
+            throw new OCSForbiddenException();
+        }
+
+        $this->jobList->add(
+            'OCA\Federation\BackgroundJob\GetSharedSecret',
+            [
+                'url' => $url,
+                'token' => $token,
+                'created' => $this->timeFactory->getTime()
+            ]
+        );
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * create shared secret and return it
+     *
+     * @param string $url
+     * @param string $token
+     * @return Http\DataResponse
+     * @throws OCSForbiddenException
+     */
+    public function getSharedSecret($url, $token) {
+        if ($this->trustedServers->isTrustedServer($url) === false) {
+            $this->logger->error('remote server not trusted (' . $url . ') while getting shared secret', ['app' => 'federation']);
+            throw new OCSForbiddenException();
+        }
+
+        if ($this->isValidToken($url, $token) === false) {
+            $expectedToken = $this->dbHandler->getToken($url);
+            $this->logger->error(
+                'remote server (' . $url . ') didn\'t send a valid token (got "' . $token . '" but expected "'. $expectedToken . '") while getting shared secret',
+                ['app' => 'federation']
+            );
+            throw new OCSForbiddenException();
+        }
+
+        $sharedSecret = $this->secureRandom->generate(32);
+
+        $this->trustedServers->addSharedSecret($url, $sharedSecret);
+        // reset token after the exchange of the shared secret was successful
+        $this->dbHandler->addToken($url, '');
+
+        return new Http\DataResponse([
+            'sharedSecret' => $sharedSecret
+        ]);
+    }
+
+    protected function isValidToken($url, $token) {
+        $storedToken = $this->dbHandler->getToken($url);
+        return hash_equals($storedToken, $token);
+    }
 }

apps/federation/lib/Command/SyncFederationAddressBooks.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		$progress->start();
 		$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
 			if ($ex instanceof \Exception) {
-				$output->writeln("Error while syncing $url : " . $ex->getMessage());
+				$output->writeln("Error while syncing $url : ".$ex->getMessage());
 
 			} else {
 				$progress->advance();

Indentation +33 added lines, -33 removed lines

@@ -30,45 +30,45 @@
 
 class SyncFederationAddressBooks extends Command {
 
-	/** @var \OCA\Federation\SyncFederationAddressBooks */
-	private $syncService;
+    /** @var \OCA\Federation\SyncFederationAddressBooks */
+    private $syncService;
 
-	/**
-	 * @param \OCA\Federation\SyncFederationAddressBooks $syncService
-	 */
-	public function __construct(\OCA\Federation\SyncFederationAddressBooks $syncService) {
-		parent::__construct();
+    /**
+     * @param \OCA\Federation\SyncFederationAddressBooks $syncService
+     */
+    public function __construct(\OCA\Federation\SyncFederationAddressBooks $syncService) {
+        parent::__construct();
 
-		$this->syncService = $syncService;
-	}
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('federation:sync-addressbooks')
-			->setDescription('Synchronizes addressbooks of all federated clouds');
-	}
+    protected function configure() {
+        $this
+            ->setName('federation:sync-addressbooks')
+            ->setDescription('Synchronizes addressbooks of all federated clouds');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
-			if ($ex instanceof \Exception) {
-				$output->writeln("Error while syncing $url : " . $ex->getMessage());
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
+            if ($ex instanceof \Exception) {
+                $output->writeln("Error while syncing $url : " . $ex->getMessage());
 
-			} else {
-				$progress->advance();
-			}
-		});
+            } else {
+                $progress->advance();
+            }
+        });
 
-		$progress->finish();
-		$output->writeln('');
+        $progress->finish();
+        $output->writeln('');
 
-		return 0;
-	}
+        return 0;
+    }
 }

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Braces +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 			&& $status !== Http::STATUS_FORBIDDEN
 		) {
 			$this->retainJob = true;
-		}  else {
+		} else {
 			// reset token if we received a valid response
 			$this->dbHandler->addToken($target, '');
 		}

Indentation +209 added lines, -209 removed lines

@@ -57,213 +57,213 @@
  */
 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 IDiscoveryService  */
-	private $ocsDiscoveryService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var bool */
-	protected $retainJob = false;
-
-	private $format = '?format=json';
-
-	private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
-
-	/** @var  int  30 day = 2592000sec */
-	private $maxLifespan = 2592000;
-
-	/**
-	 * RequestSharedSecret constructor.
-	 *
-	 * @param IClientService $httpClientService
-	 * @param IURLGenerator $urlGenerator
-	 * @param IJobList $jobList
-	 * @param TrustedServers $trustedServers
-	 * @param ILogger $logger
-	 * @param DbHandler $dbHandler
-	 * @param IDiscoveryService $ocsDiscoveryService
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(
-		IClientService $httpClientService,
-		IURLGenerator $urlGenerator,
-		IJobList $jobList,
-		TrustedServers $trustedServers,
-		ILogger $logger,
-		DbHandler $dbHandler,
-		IDiscoveryService $ocsDiscoveryService,
-		ITimeFactory $timeFactory
-	) {
-		$this->logger = $logger;
-		$this->httpClient = $httpClientService->newClient();
-		$this->jobList = $jobList;
-		$this->urlGenerator = $urlGenerator;
-		$this->dbHandler = $dbHandler;
-		$this->ocsDiscoveryService = $ocsDiscoveryService;
-		$this->trustedServers = $trustedServers;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $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);
-		}
-
-		$jobList->remove($this, $this->argument);
-
-		if ($this->retainJob) {
-			$this->reAddJob($this->argument);
-		}
-	}
-
-	/**
-	 * call execute() method of parent
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	protected function parentExecute($jobList, $logger = null) {
-		parent::execute($jobList, $logger);
-	}
-
-	protected function run($argument) {
-		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
-		$currentTime = $this->timeFactory->getTime();
-		$source = $this->urlGenerator->getAbsoluteURL('/');
-		$source = rtrim($source, '/');
-		$token = $argument['token'];
-
-		// kill job after 30 days of trying
-		$deadline = $currentTime - $this->maxLifespan;
-		if ($created < $deadline) {
-			$this->retainJob = false;
-			$this->trustedServers->setServerStatus($target,TrustedServers::STATUS_FAILURE);
-			return;
-		}
-
-		$endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
-		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
-
-		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
-
-		$result = null;
-		try {
-			$result = $this->httpClient->get(
-				$url,
-				[
-					'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->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
-			}
-		} catch (RequestException $e) {
-			$status = -1; // There is no status code if we could not connect
-			$this->logger->logException($e, [
-				'message' => 'Could not connect to ' . $target,
-				'level' => \OCP\Util::INFO,
-				'app' => 'federation',
-			]);
-		} catch (RingException $e) {
-			$status = -1; // There is no status code if we could not connect
-			$this->logger->logException($e, [
-				'message' => 'Could not connect to ' . $target,
-				'level' => \OCP\Util::INFO,
-				'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);
-			}
-		}
-
-	}
-
-	/**
-	 * re-add background job
-	 *
-	 * @param array $argument
-	 */
-	protected function reAddJob(array $argument) {
-		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
-		$token = $argument['token'];
-		$this->jobList->add(
-			GetSharedSecret::class,
-			[
-				'url' => $url,
-				'token' => $token,
-				'created' => $created
-			]
-		);
-	}
+    /** @var IClient */
+    private $httpClient;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var TrustedServers  */
+    private $trustedServers;
+
+    /** @var DbHandler */
+    private $dbHandler;
+
+    /** @var IDiscoveryService  */
+    private $ocsDiscoveryService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var bool */
+    protected $retainJob = false;
+
+    private $format = '?format=json';
+
+    private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
+
+    /** @var  int  30 day = 2592000sec */
+    private $maxLifespan = 2592000;
+
+    /**
+     * RequestSharedSecret constructor.
+     *
+     * @param IClientService $httpClientService
+     * @param IURLGenerator $urlGenerator
+     * @param IJobList $jobList
+     * @param TrustedServers $trustedServers
+     * @param ILogger $logger
+     * @param DbHandler $dbHandler
+     * @param IDiscoveryService $ocsDiscoveryService
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(
+        IClientService $httpClientService,
+        IURLGenerator $urlGenerator,
+        IJobList $jobList,
+        TrustedServers $trustedServers,
+        ILogger $logger,
+        DbHandler $dbHandler,
+        IDiscoveryService $ocsDiscoveryService,
+        ITimeFactory $timeFactory
+    ) {
+        $this->logger = $logger;
+        $this->httpClient = $httpClientService->newClient();
+        $this->jobList = $jobList;
+        $this->urlGenerator = $urlGenerator;
+        $this->dbHandler = $dbHandler;
+        $this->ocsDiscoveryService = $ocsDiscoveryService;
+        $this->trustedServers = $trustedServers;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $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);
+        }
+
+        $jobList->remove($this, $this->argument);
+
+        if ($this->retainJob) {
+            $this->reAddJob($this->argument);
+        }
+    }
+
+    /**
+     * call execute() method of parent
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    protected function parentExecute($jobList, $logger = null) {
+        parent::execute($jobList, $logger);
+    }
+
+    protected function run($argument) {
+        $target = $argument['url'];
+        $created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
+        $currentTime = $this->timeFactory->getTime();
+        $source = $this->urlGenerator->getAbsoluteURL('/');
+        $source = rtrim($source, '/');
+        $token = $argument['token'];
+
+        // kill job after 30 days of trying
+        $deadline = $currentTime - $this->maxLifespan;
+        if ($created < $deadline) {
+            $this->retainJob = false;
+            $this->trustedServers->setServerStatus($target,TrustedServers::STATUS_FAILURE);
+            return;
+        }
+
+        $endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
+        $endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
+
+        // make sure that we have a well formatted url
+        $url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+
+        $result = null;
+        try {
+            $result = $this->httpClient->get(
+                $url,
+                [
+                    '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->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+            }
+        } catch (RequestException $e) {
+            $status = -1; // There is no status code if we could not connect
+            $this->logger->logException($e, [
+                'message' => 'Could not connect to ' . $target,
+                'level' => \OCP\Util::INFO,
+                'app' => 'federation',
+            ]);
+        } catch (RingException $e) {
+            $status = -1; // There is no status code if we could not connect
+            $this->logger->logException($e, [
+                'message' => 'Could not connect to ' . $target,
+                'level' => \OCP\Util::INFO,
+                '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);
+            }
+        }
+
+    }
+
+    /**
+     * re-add background job
+     *
+     * @param array $argument
+     */
+    protected function reAddJob(array $argument) {
+        $url = $argument['url'];
+        $created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
+        $token = $argument['token'];
+        $this->jobList->add(
+            GetSharedSecret::class,
+            [
+                'url' => $url,
+                'token' => $token,
+                'created' => $created
+            ]
+        );
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -155,7 +155,7 @@ 
 
 	protected function run($argument) {
 		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->timeFactory->getTime();
 		$currentTime = $this->timeFactory->getTime();
 		$source = $this->urlGenerator->getAbsoluteURL('/');
 		$source = rtrim($source, '/');
@@ -165,7 +165,7 @@ 
 		$deadline = $currentTime - $this->maxLifespan;
 		if ($created < $deadline) {
 			$this->retainJob = false;
-			$this->trustedServers->setServerStatus($target,TrustedServers::STATUS_FAILURE);
+			$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
 			return;
 		}
 
@@ -173,7 +173,7 @@ 
 		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
 
 		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/').$this->format;
 
 		$result = null;
 		try {
@@ -195,21 +195,21 @@ 
 		} 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']);
+				$this->logger->info($target.' refused to exchange a shared secret with you.', ['app' => 'federation']);
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage(), ['app' => 'federation']);
 			}
 		} catch (RequestException $e) {
 			$status = -1; // There is no status code if we could not connect
 			$this->logger->logException($e, [
-				'message' => 'Could not connect to ' . $target,
+				'message' => 'Could not connect to '.$target,
 				'level' => \OCP\Util::INFO,
 				'app' => 'federation',
 			]);
 		} catch (RingException $e) {
 			$status = -1; // There is no status code if we could not connect
 			$this->logger->logException($e, [
-				'message' => 'Could not connect to ' . $target,
+				'message' => 'Could not connect to '.$target,
 				'level' => \OCP\Util::INFO,
 				'app' => 'federation',
 			]);
@@ -224,7 +224,7 @@ 
 			&& $status !== Http::STATUS_FORBIDDEN
 		) {
 			$this->retainJob = true;
-		}  else {
+		} else {
 			// reset token if we received a valid response
 			$this->dbHandler->addToken($target, '');
 		}
@@ -239,7 +239,7 @@ 
 				);
 			} else {
 				$this->logger->error(
-						'remote server "' . $target . '"" does not return a valid shared secret',
+						'remote server "'.$target.'"" does not return a valid shared secret',
 						['app' => 'federation']
 				);
 				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
@@ -255,7 +255,7 @@ 
 	 */
 	protected function reAddJob(array $argument) {
 		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->timeFactory->getTime();
 		$token = $argument['token'];
 		$this->jobList->add(
 			GetSharedSecret::class,

apps/federation/lib/Settings/Admin.php

Indentation +31 added lines, -31 removed lines

@@ -29,41 +29,41 @@
 
 class Admin implements ISettings {
 
-	/** @var TrustedServers */
-	private $trustedServers;
+    /** @var TrustedServers */
+    private $trustedServers;
 
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
+    public function __construct(TrustedServers $trustedServers) {
+        $this->trustedServers = $trustedServers;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'trustedServers' => $this->trustedServers->getServers(),
-			'autoAddServers' => $this->trustedServers->getAutoAddServers(),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'trustedServers' => $this->trustedServers->getServers(),
+            'autoAddServers' => $this->trustedServers->getAutoAddServers(),
+        ];
 
-		return new TemplateResponse('federation', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('federation', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 30;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 30;
+    }
 
 }

apps/federation/lib/Hooks.php

Indentation +20 added lines, -20 removed lines

@@ -27,25 +27,25 @@
 
 class Hooks {
 
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
-
-	/**
-	 * add servers to the list of trusted servers once a federated share was established
-	 *
-	 * @param array $params
-	 */
-	public function addServerHook($params) {
-		if (
-			$this->trustedServers->getAutoAddServers() === true &&
-			$this->trustedServers->isTrustedServer($params['server']) === false
-		) {
-			$this->trustedServers->addServer($params['server']);
-		}
-	}
+    /** @var TrustedServers */
+    private $trustedServers;
+
+    public function __construct(TrustedServers $trustedServers) {
+        $this->trustedServers = $trustedServers;
+    }
+
+    /**
+     * add servers to the list of trusted servers once a federated share was established
+     *
+     * @param array $params
+     */
+    public function addServerHook($params) {
+        if (
+            $this->trustedServers->getAutoAddServers() === true &&
+            $this->trustedServers->isTrustedServer($params['server']) === false
+        ) {
+            $this->trustedServers->addServer($params['server']);
+        }
+    }
 
 }

apps/dav/lib/DAV/PublicAuth.php

Indentation +58 added lines, -58 removed lines

@@ -26,67 +26,67 @@
 
 class PublicAuth implements BackendInterface {
 
-	/** @var string[] */
-	private $publicURLs;
+    /** @var string[] */
+    private $publicURLs;
 
-	public function __construct() {
-		$this->publicURLs = [
-			'public-calendars',
-			'principals/system/public'
-		];
-	}
+    public function __construct() {
+        $this->publicURLs = [
+            'public-calendars',
+            'principals/system/public'
+        ];
+    }
 
-	/**
-	 * When this method is called, the backend must check if authentication was
-	 * successful.
-	 *
-	 * The returned value must be one of the following
-	 *
-	 * [true, "principals/username"]
-	 * [false, "reason for failure"]
-	 *
-	 * If authentication was successful, it's expected that the authentication
-	 * backend returns a so-called principal url.
-	 *
-	 * Examples of a principal url:
-	 *
-	 * principals/admin
-	 * principals/user1
-	 * principals/users/joe
-	 * principals/uid/123457
-	 *
-	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-	 * return a string such as:
-	 *
-	 * principals/users/[username]
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return array
-	 */
-	function check(RequestInterface $request, ResponseInterface $response) {
+    /**
+     * When this method is called, the backend must check if authentication was
+     * successful.
+     *
+     * The returned value must be one of the following
+     *
+     * [true, "principals/username"]
+     * [false, "reason for failure"]
+     *
+     * If authentication was successful, it's expected that the authentication
+     * backend returns a so-called principal url.
+     *
+     * Examples of a principal url:
+     *
+     * principals/admin
+     * principals/user1
+     * principals/users/joe
+     * principals/uid/123457
+     *
+     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+     * return a string such as:
+     *
+     * principals/users/[username]
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return array
+     */
+    function check(RequestInterface $request, ResponseInterface $response) {
 
-		if ($this->isRequestPublic($request)) {
-			return [true, "principals/system/public"];
-		}
-		return [false, "No public access to this resource."];
-	}
+        if ($this->isRequestPublic($request)) {
+            return [true, "principals/system/public"];
+        }
+        return [false, "No public access to this resource."];
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function challenge(RequestInterface $request, ResponseInterface $response) {
-	}
+    /**
+     * @inheritdoc
+     */
+    function challenge(RequestInterface $request, ResponseInterface $response) {
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @return bool
-	 */
-	private function isRequestPublic(RequestInterface $request) {
-		$url = $request->getPath();
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
-			return strpos($url, $publicUrl, 0) === 0;
-		});
-		return !empty($matchingUrls);
-	}
+    /**
+     * @param RequestInterface $request
+     * @return bool
+     */
+    private function isRequestPublic(RequestInterface $request) {
+        $url = $request->getPath();
+        $matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
+            return strpos($url, $publicUrl, 0) === 0;
+        });
+        return !empty($matchingUrls);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	private function isRequestPublic(RequestInterface $request) {
 		$url = $request->getPath();
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
+		$matchingUrls = array_filter($this->publicURLs, function($publicUrl) use ($url) {
 			return strpos($url, $publicUrl, 0) === 0;
 		});
 		return !empty($matchingUrls);

apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php

Spacing +7 added lines, -7 removed lines

@@ -47,8 +47,8 @@ 
     static function xmlDeserialize(Reader $reader) {
 
         $elements = $reader->parseInnerTree([
-            '{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
-            '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+            '{'.Plugin::NS_OWNCLOUD.'}set'    => 'Sabre\\Xml\\Element\\KeyValue',
+            '{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue',
         ]);
 
         $set = [];
@@ -57,21 +57,21 @@ 
         foreach ($elements as $elem) {
             switch ($elem['name']) {
 
-                case '{' . Plugin::NS_OWNCLOUD . '}set' :
+                case '{'.Plugin::NS_OWNCLOUD.'}set' :
                     $sharee = $elem['value'];
 
-                    $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-                    $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+                    $sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary';
+                    $commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name';
 
                     $set[] = [
                         'href'       => $sharee['{DAV:}href'],
                         'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
                         'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-                        'readOnly'   => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+                        'readOnly'   => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee),
                     ];
                     break;
 
-                case '{' . Plugin::NS_OWNCLOUD . '}remove' :
+                case '{'.Plugin::NS_OWNCLOUD.'}remove' :
                     $remove[] = $elem['value']['{DAV:}href'];
                     break;