nextcloud / server

apps/federation/lib/DAV/FedAuth.php

Indentation +32 added lines, -32 removed lines

@@ -29,40 +29,40 @@
 
 class FedAuth extends AbstractBasic {
 
-	/** @var DbHandler */
-	private $db;
+    /** @var DbHandler */
+    private $db;
 
-	/**
-	 * FedAuth constructor.
-	 *
-	 * @param DbHandler $db
-	 */
-	public function __construct(DbHandler $db) {
-		$this->db = $db;
-		$this->principalPrefix = 'principals/system/';
+    /**
+     * FedAuth constructor.
+     *
+     * @param DbHandler $db
+     */
+    public function __construct(DbHandler $db) {
+        $this->db = $db;
+        $this->principalPrefix = 'principals/system/';
 
-		// setup realm
-		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
-	}
+        // setup realm
+        $defaults = new \OCP\Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @return bool
-	 */
-	protected function validateUserPass($username, $password) {
-		return $this->db->auth($username, $password);
-	}
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     */
+    protected function validateUserPass($username, $password) {
+        return $this->db->auth($username, $password);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function challenge(RequestInterface $request, ResponseInterface $response) {
-	}
+    /**
+     * @inheritdoc
+     */
+    public function challenge(RequestInterface $request, ResponseInterface $response) {
+    }
 }

apps/federation/lib/BackgroundJob/RequestSharedSecret.php

Indentation +181 added lines, -181 removed lines

@@ -50,185 +50,185 @@
  */
 class RequestSharedSecret extends Job {
 
-	/** @var IClient */
-	private $httpClient;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var DbHandler */
-	private $dbHandler;
-
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	/** @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/request-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 DbHandler $dbHandler
-	 * @param IDiscoveryService $ocsDiscoveryService
-	 * @param ILogger $logger
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(
-		IClientService $httpClientService,
-		IURLGenerator $urlGenerator,
-		IJobList $jobList,
-		TrustedServers $trustedServers,
-		DbHandler $dbHandler,
-		IDiscoveryService $ocsDiscoveryService,
-		ILogger $logger,
-		ITimeFactory $timeFactory
-	) {
-		$this->httpClient = $httpClientService->newClient();
-		$this->jobList = $jobList;
-		$this->urlGenerator = $urlGenerator;
-		$this->dbHandler = $dbHandler;
-		$this->logger = $logger;
-		$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) {
-		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 formated url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
-
-		try {
-			$result = $this->httpClient->post(
-				$url,
-				[
-					'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->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['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, '');
-		}
-
-	}
-
-	/**
-	 * 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(
-			RequestSharedSecret::class,
-			[
-				'url' => $url,
-				'token' => $token,
-				'created' => $created
-			]
-		);
-	}
+    /** @var IClient */
+    private $httpClient;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var DbHandler */
+    private $dbHandler;
+
+    /** @var TrustedServers */
+    private $trustedServers;
+
+    /** @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/request-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 DbHandler $dbHandler
+     * @param IDiscoveryService $ocsDiscoveryService
+     * @param ILogger $logger
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(
+        IClientService $httpClientService,
+        IURLGenerator $urlGenerator,
+        IJobList $jobList,
+        TrustedServers $trustedServers,
+        DbHandler $dbHandler,
+        IDiscoveryService $ocsDiscoveryService,
+        ILogger $logger,
+        ITimeFactory $timeFactory
+    ) {
+        $this->httpClient = $httpClientService->newClient();
+        $this->jobList = $jobList;
+        $this->urlGenerator = $urlGenerator;
+        $this->dbHandler = $dbHandler;
+        $this->logger = $logger;
+        $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) {
+        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 formated url
+        $url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+
+        try {
+            $result = $this->httpClient->post(
+                $url,
+                [
+                    '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->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['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, '');
+        }
+
+    }
+
+    /**
+     * 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(
+            RequestSharedSecret::class,
+            [
+                'url' => $url,
+                'token' => $token,
+                'created' => $created
+            ]
+        );
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -150,7 +150,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, '/');
@@ -168,7 +168,7 @@ 
 		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
 
 		// make sure that we have a well formated url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/').$this->format;
 
 		try {
 			$result = $this->httpClient->post(
@@ -188,9 +188,9 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
+				$this->logger->info($target.' refused to ask for a shared secret.', ['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 (\Exception $e) {
 			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
@@ -219,7 +219,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(

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Indentation +195 added lines, -195 removed lines

@@ -50,199 +50,199 @@
  */
 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 (\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 (\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 +8 added lines, -8 removed lines

@@ -148,7 +148,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, '/');
@@ -158,7 +158,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;
 		}
 
@@ -166,7 +166,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 {
@@ -188,9 +188,9 @@ 
 		} 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 (\Exception $e) {
 			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
@@ -203,7 +203,7 @@ 
 			&& $status !== Http::STATUS_FORBIDDEN
 		) {
 			$this->retainJob = true;
-		}  else {
+		} else {
 			// reset token if we received a valid response
 			$this->dbHandler->addToken($target, '');
 		}
@@ -218,7 +218,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);
@@ -234,7 +234,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/Controller/OCSAuthAPIController.php

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/TrustedServers.php

Indentation +244 added lines, -244 removed lines

@@ -39,248 +39,248 @@
 
 class TrustedServers {
 
-	/** after a user list was exchanged at least once successfully */
-	const STATUS_OK = 1;
-	/** waiting for shared secret or initial user list exchange */
-	const STATUS_PENDING = 2;
-	/** something went wrong, misconfigured server, software bug,... user interaction needed */
-	const STATUS_FAILURE = 3;
-	/** remote server revoked access */
-	const STATUS_ACCESS_REVOKED = 4;
-
-	/** @var  dbHandler */
-	private $dbHandler;
-
-	/** @var  IClientService */
-	private $httpClientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * @param DbHandler $dbHandler
-	 * @param IClientService $httpClientService
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ISecureRandom $secureRandom
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(
-		DbHandler $dbHandler,
-		IClientService $httpClientService,
-		ILogger $logger,
-		IJobList $jobList,
-		ISecureRandom $secureRandom,
-		IConfig $config,
-		EventDispatcherInterface $dispatcher,
-		ITimeFactory $timeFactory
-	) {
-		$this->dbHandler = $dbHandler;
-		$this->httpClientService = $httpClientService;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * add server to the list of trusted servers
-	 *
-	 * @param $url
-	 * @return int server id
-	 */
-	public function addServer($url) {
-		$url = $this->updateProtocol($url);
-		$result = $this->dbHandler->addServer($url);
-		if ($result) {
-			$token = $this->secureRandom->generate(16);
-			$this->dbHandler->addToken($url, $token);
-			$this->jobList->add(
-				'OCA\Federation\BackgroundJob\RequestSharedSecret',
-				[
-					'url' => $url,
-					'token' => $token,
-					'created' => $this->timeFactory->getTime()
-				]
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * enable/disable to automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @param bool $status
-	 */
-	public function setAutoAddServers($status) {
-		$value = $status ? '1' : '0';
-		$this->config->setAppValue('federation', 'autoAddServers', $value);
-	}
-
-	/**
-	 * return if we automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @return bool
-	 */
-	public function getAutoAddServers() {
-		$value = $this->config->getAppValue('federation', 'autoAddServers', '0');
-		return $value === '1';
-	}
-
-	/**
-	 * get shared secret for the given server
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function getSharedSecret($url) {
-		return $this->dbHandler->getSharedSecret($url);
-	}
-
-	/**
-	 * add shared secret for the given server
-	 *
-	 * @param string $url
-	 * @param $sharedSecret
-	 */
-	public function addSharedSecret($url, $sharedSecret) {
-		$this->dbHandler->addSharedSecret($url, $sharedSecret);
-	}
-
-	/**
-	 * remove server from the list of trusted servers
-	 *
-	 * @param int $id
-	 */
-	public function removeServer($id) {
-		$server = $this->dbHandler->getServerById($id);
-		$this->dbHandler->removeServer($id);
-		$event = new GenericEvent($server['url_hash']);
-		$this->dispatcher->dispatch('OCP\Federation\TrustedServerEvent::remove', $event);
-	}
-
-	/**
-	 * get all trusted servers
-	 *
-	 * @return array
-	 */
-	public function getServers() {
-		return $this->dbHandler->getAllServer();
-	}
-
-	/**
-	 * check if given server is a trusted Nextcloud server
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function isTrustedServer($url) {
-		return $this->dbHandler->serverExists($url);
-	}
-
-	/**
-	 * set server status
-	 *
-	 * @param string $url
-	 * @param int $status
-	 */
-	public function setServerStatus($url, $status) {
-		$this->dbHandler->setServerStatus($url, $status);
-	}
-
-	/**
-	 * @param string $url
-	 * @return int
-	 */
-	public function getServerStatus($url) {
-		return $this->dbHandler->getServerStatus($url);
-	}
-
-	/**
-	 * check if URL point to a ownCloud/Nextcloud server
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function isOwnCloudServer($url) {
-		$isValidOwnCloud = false;
-		$client = $this->httpClientService->newClient();
-		try {
-			$result = $client->get(
-				$url . '/status.php',
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
-			if ($result->getStatusCode() === Http::STATUS_OK) {
-				$isValidOwnCloud = $this->checkOwnCloudVersion($result->getBody());
-
-			}
-		} catch (\Exception $e) {
-			$this->logger->debug('No Nextcloud server: ' . $e->getMessage());
-			return false;
-		}
-
-		return $isValidOwnCloud;
-	}
-
-	/**
-	 * check if ownCloud version is >= 9.0
-	 *
-	 * @param $status
-	 * @return bool
-	 * @throws HintException
-	 */
-	protected function checkOwnCloudVersion($status) {
-		$decoded = json_decode($status, true);
-		if (!empty($decoded) && isset($decoded['version'])) {
-			if (!version_compare($decoded['version'], '9.0.0', '>=')) {
-				throw new HintException('Remote server version is too low. 9.0 is required.');
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * check if the URL contain a protocol, if not add https
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function updateProtocol($url) {
-		if (
-			strpos($url, 'https://') === 0
-			|| strpos($url, 'http://') === 0
-		) {
-
-			return $url;
-
-		}
-
-		return 'https://' . $url;
-	}
+    /** after a user list was exchanged at least once successfully */
+    const STATUS_OK = 1;
+    /** waiting for shared secret or initial user list exchange */
+    const STATUS_PENDING = 2;
+    /** something went wrong, misconfigured server, software bug,... user interaction needed */
+    const STATUS_FAILURE = 3;
+    /** remote server revoked access */
+    const STATUS_ACCESS_REVOKED = 4;
+
+    /** @var  dbHandler */
+    private $dbHandler;
+
+    /** @var  IClientService */
+    private $httpClientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * @param DbHandler $dbHandler
+     * @param IClientService $httpClientService
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ISecureRandom $secureRandom
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(
+        DbHandler $dbHandler,
+        IClientService $httpClientService,
+        ILogger $logger,
+        IJobList $jobList,
+        ISecureRandom $secureRandom,
+        IConfig $config,
+        EventDispatcherInterface $dispatcher,
+        ITimeFactory $timeFactory
+    ) {
+        $this->dbHandler = $dbHandler;
+        $this->httpClientService = $httpClientService;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * add server to the list of trusted servers
+     *
+     * @param $url
+     * @return int server id
+     */
+    public function addServer($url) {
+        $url = $this->updateProtocol($url);
+        $result = $this->dbHandler->addServer($url);
+        if ($result) {
+            $token = $this->secureRandom->generate(16);
+            $this->dbHandler->addToken($url, $token);
+            $this->jobList->add(
+                'OCA\Federation\BackgroundJob\RequestSharedSecret',
+                [
+                    'url' => $url,
+                    'token' => $token,
+                    'created' => $this->timeFactory->getTime()
+                ]
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * enable/disable to automatically add servers to the list of trusted servers
+     * once a federated share was created and accepted successfully
+     *
+     * @param bool $status
+     */
+    public function setAutoAddServers($status) {
+        $value = $status ? '1' : '0';
+        $this->config->setAppValue('federation', 'autoAddServers', $value);
+    }
+
+    /**
+     * return if we automatically add servers to the list of trusted servers
+     * once a federated share was created and accepted successfully
+     *
+     * @return bool
+     */
+    public function getAutoAddServers() {
+        $value = $this->config->getAppValue('federation', 'autoAddServers', '0');
+        return $value === '1';
+    }
+
+    /**
+     * get shared secret for the given server
+     *
+     * @param string $url
+     * @return string
+     */
+    public function getSharedSecret($url) {
+        return $this->dbHandler->getSharedSecret($url);
+    }
+
+    /**
+     * add shared secret for the given server
+     *
+     * @param string $url
+     * @param $sharedSecret
+     */
+    public function addSharedSecret($url, $sharedSecret) {
+        $this->dbHandler->addSharedSecret($url, $sharedSecret);
+    }
+
+    /**
+     * remove server from the list of trusted servers
+     *
+     * @param int $id
+     */
+    public function removeServer($id) {
+        $server = $this->dbHandler->getServerById($id);
+        $this->dbHandler->removeServer($id);
+        $event = new GenericEvent($server['url_hash']);
+        $this->dispatcher->dispatch('OCP\Federation\TrustedServerEvent::remove', $event);
+    }
+
+    /**
+     * get all trusted servers
+     *
+     * @return array
+     */
+    public function getServers() {
+        return $this->dbHandler->getAllServer();
+    }
+
+    /**
+     * check if given server is a trusted Nextcloud server
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function isTrustedServer($url) {
+        return $this->dbHandler->serverExists($url);
+    }
+
+    /**
+     * set server status
+     *
+     * @param string $url
+     * @param int $status
+     */
+    public function setServerStatus($url, $status) {
+        $this->dbHandler->setServerStatus($url, $status);
+    }
+
+    /**
+     * @param string $url
+     * @return int
+     */
+    public function getServerStatus($url) {
+        return $this->dbHandler->getServerStatus($url);
+    }
+
+    /**
+     * check if URL point to a ownCloud/Nextcloud server
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function isOwnCloudServer($url) {
+        $isValidOwnCloud = false;
+        $client = $this->httpClientService->newClient();
+        try {
+            $result = $client->get(
+                $url . '/status.php',
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
+            if ($result->getStatusCode() === Http::STATUS_OK) {
+                $isValidOwnCloud = $this->checkOwnCloudVersion($result->getBody());
+
+            }
+        } catch (\Exception $e) {
+            $this->logger->debug('No Nextcloud server: ' . $e->getMessage());
+            return false;
+        }
+
+        return $isValidOwnCloud;
+    }
+
+    /**
+     * check if ownCloud version is >= 9.0
+     *
+     * @param $status
+     * @return bool
+     * @throws HintException
+     */
+    protected function checkOwnCloudVersion($status) {
+        $decoded = json_decode($status, true);
+        if (!empty($decoded) && isset($decoded['version'])) {
+            if (!version_compare($decoded['version'], '9.0.0', '>=')) {
+                throw new HintException('Remote server version is too low. 9.0 is required.');
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * check if the URL contain a protocol, if not add https
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function updateProtocol($url) {
+        if (
+            strpos($url, 'https://') === 0
+            || strpos($url, 'http://') === 0
+        ) {
+
+            return $url;
+
+        }
+
+        return 'https://' . $url;
+    }
 }

apps/federation/lib/Middleware/AddServerMiddleware.php

Indentation +40 added lines, -40 removed lines

@@ -35,51 +35,51 @@
 
 class AddServerMiddleware extends Middleware {
 
-	/** @var  string */
-	protected $appName;
+    /** @var  string */
+    protected $appName;
 
-	/** @var  IL10N */
-	protected $l;
+    /** @var  IL10N */
+    protected $l;
 
-	/** @var  ILogger */
-	protected $logger;
+    /** @var  ILogger */
+    protected $logger;
 
-	/**
-	 * @param string $appName
-	 * @param IL10N $l
-	 * @param ILogger $logger
-	 */
-	public function __construct($appName, IL10N $l, ILogger $logger) {
-		$this->appName = $appName;
-		$this->l = $l;
-		$this->logger = $logger;
-	}
+    /**
+     * @param string $appName
+     * @param IL10N $l
+     * @param ILogger $logger
+     */
+    public function __construct($appName, IL10N $l, ILogger $logger) {
+        $this->appName = $appName;
+        $this->l = $l;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Log error message and return a response which can be displayed to the user
-	 *
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @return JSONResponse
-	 * @throws \Exception
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if (($controller instanceof SettingsController) === false) {
-			throw $exception;
-		}
-		$this->logger->error($exception->getMessage(), ['app' => $this->appName]);
-		if ($exception instanceof HintException) {
-			$message = $exception->getHint();
-		} else {
-			$message = $exception->getMessage();
-		}
+    /**
+     * Log error message and return a response which can be displayed to the user
+     *
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @return JSONResponse
+     * @throws \Exception
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if (($controller instanceof SettingsController) === false) {
+            throw $exception;
+        }
+        $this->logger->error($exception->getMessage(), ['app' => $this->appName]);
+        if ($exception instanceof HintException) {
+            $message = $exception->getHint();
+        } else {
+            $message = $exception->getMessage();
+        }
 
-		return new JSONResponse(
-			['message' => $message],
-			Http::STATUS_BAD_REQUEST
-		);
+        return new JSONResponse(
+            ['message' => $message],
+            Http::STATUS_BAD_REQUEST
+        );
 
-	}
+    }
 
 }

apps/federation/lib/DbHandler.php

Indentation +289 added lines, -289 removed lines

@@ -42,294 +42,294 @@
  */
 class DbHandler {
 
-	/** @var  IDBConnection */
-	private $connection;
-
-	/** @var  IL10N */
-	private $IL10N;
-
-	/** @var string  */
-	private $dbTable = 'trusted_servers';
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IL10N $il10n
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		IL10N $il10n
-	) {
-		$this->connection = $connection;
-		$this->IL10N = $il10n;
-	}
-
-	/**
-	 * add server to the list of trusted servers
-	 *
-	 * @param string $url
-	 * @return int
-	 * @throws HintException
-	 */
-	public function addServer($url) {
-		$hash = $this->hash($url);
-		$url = rtrim($url, '/');
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->dbTable)
-			->values(
-				[
-					'url' =>  $query->createParameter('url'),
-					'url_hash' => $query->createParameter('url_hash'),
-				]
-			)
-			->setParameter('url', $url)
-			->setParameter('url_hash', $hash);
-
-		$result = $query->execute();
-
-		if ($result) {
-			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
-		}
-
-		$message = 'Internal failure, Could not add trusted server: ' . $url;
-		$message_t = $this->IL10N->t('Could not add server');
-		throw new HintException($message, $message_t);
-	}
-
-	/**
-	 * remove server from the list of trusted servers
-	 *
-	 * @param int $id
-	 */
-	public function removeServer($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->dbTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-		$query->execute();
-	}
-
-	/**
-	 * get trusted server with given ID
-	 *
-	 * @param int $id
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getServerById($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from($this->dbTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-		$query->execute();
-		$result = $query->execute()->fetchAll();
-
-		if (empty($result)) {
-			throw new \Exception('No Server found with ID: ' . $id);
-		}
-
-		return $result[0];
-	}
-
-	/**
-	 * get all trusted servers
-	 *
-	 * @return array
-	 */
-	public function getAllServer() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])
-			->from($this->dbTable);
-		$statement = $query->execute();
-		$result = $statement->fetchAll();
-		$statement->closeCursor();
-		return $result;
-	}
-
-	/**
-	 * check if server already exists in the database table
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function serverExists($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('url')
-			->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-		$statement = $query->execute();
-		$result = $statement->fetchAll();
-		$statement->closeCursor();
-
-		return !empty($result);
-	}
-
-	/**
-	 * write token to database. Token is used to exchange the secret
-	 *
-	 * @param string $url
-	 * @param string $token
-	 */
-	public function addToken($url, $token) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('token', $query->createParameter('token'))
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash)
-			->setParameter('token', $token);
-		$query->execute();
-	}
-
-	/**
-	 * get token stored in database
-	 *
-	 * @param string $url
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function getToken($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('token')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$statement = $query->execute();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-
-		if (!isset($result['token'])) {
-			throw new \Exception('No token found for: ' . $url);
-		}
-
-		return $result['token'];
-	}
-
-	/**
-	 * add shared Secret to database
-	 *
-	 * @param string $url
-	 * @param string $sharedSecret
-	 */
-	public function addSharedSecret($url, $sharedSecret) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('shared_secret', $query->createParameter('sharedSecret'))
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash)
-			->setParameter('sharedSecret', $sharedSecret);
-		$query->execute();
-	}
-
-	/**
-	 * get shared secret from database
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function getSharedSecret($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('shared_secret')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$statement = $query->execute();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return $result['shared_secret'];
-	}
-
-	/**
-	 * set server status
-	 *
-	 * @param string $url
-	 * @param int $status
-	 * @param string|null $token
-	 */
-	public function setServerStatus($url, $status, $token = null) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-				->set('status', $query->createNamedParameter($status))
-				->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash)));
-		if (!is_null($token)) {
-			$query->set('sync_token', $query->createNamedParameter($token));
-		}
-		$query->execute();
-	}
-
-	/**
-	 * get server status
-	 *
-	 * @param string $url
-	 * @return int
-	 */
-	public function getServerStatus($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('status')->from($this->dbTable)
-				->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-				->setParameter('url_hash', $hash);
-
-		$statement = $query->execute();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return (int)$result['status'];
-	}
-
-	/**
-	 * create hash from URL
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function hash($url) {
-		$normalized = $this->normalizeUrl($url);
-		return sha1($normalized);
-	}
-
-	/**
-	 * normalize URL, used to create the sha1 hash
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function normalizeUrl($url) {
-		$normalized = $url;
-
-		if (strpos($url, 'https://') === 0) {
-			$normalized = substr($url, strlen('https://'));
-		} else if (strpos($url, 'http://') === 0) {
-			$normalized = substr($url, strlen('http://'));
-		}
-
-		$normalized = Filesystem::normalizePath($normalized);
-		$normalized = trim($normalized, '/');
-
-		return $normalized;
-	}
-
-	/**
-	 * @param $username
-	 * @param $password
-	 * @return bool
-	 */
-	public function auth($username, $password) {
-		if ($username !== 'system') {
-			return false;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('url')->from($this->dbTable)
-				->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password)));
-
-		$statement = $query->execute();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return !empty($result);
-	}
+    /** @var  IDBConnection */
+    private $connection;
+
+    /** @var  IL10N */
+    private $IL10N;
+
+    /** @var string  */
+    private $dbTable = 'trusted_servers';
+
+    /**
+     * @param IDBConnection $connection
+     * @param IL10N $il10n
+     */
+    public function __construct(
+        IDBConnection $connection,
+        IL10N $il10n
+    ) {
+        $this->connection = $connection;
+        $this->IL10N = $il10n;
+    }
+
+    /**
+     * add server to the list of trusted servers
+     *
+     * @param string $url
+     * @return int
+     * @throws HintException
+     */
+    public function addServer($url) {
+        $hash = $this->hash($url);
+        $url = rtrim($url, '/');
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->dbTable)
+            ->values(
+                [
+                    'url' =>  $query->createParameter('url'),
+                    'url_hash' => $query->createParameter('url_hash'),
+                ]
+            )
+            ->setParameter('url', $url)
+            ->setParameter('url_hash', $hash);
+
+        $result = $query->execute();
+
+        if ($result) {
+            return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
+        }
+
+        $message = 'Internal failure, Could not add trusted server: ' . $url;
+        $message_t = $this->IL10N->t('Could not add server');
+        throw new HintException($message, $message_t);
+    }
+
+    /**
+     * remove server from the list of trusted servers
+     *
+     * @param int $id
+     */
+    public function removeServer($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->dbTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+        $query->execute();
+    }
+
+    /**
+     * get trusted server with given ID
+     *
+     * @param int $id
+     * @return array
+     * @throws \Exception
+     */
+    public function getServerById($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from($this->dbTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+        $query->execute();
+        $result = $query->execute()->fetchAll();
+
+        if (empty($result)) {
+            throw new \Exception('No Server found with ID: ' . $id);
+        }
+
+        return $result[0];
+    }
+
+    /**
+     * get all trusted servers
+     *
+     * @return array
+     */
+    public function getAllServer() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])
+            ->from($this->dbTable);
+        $statement = $query->execute();
+        $result = $statement->fetchAll();
+        $statement->closeCursor();
+        return $result;
+    }
+
+    /**
+     * check if server already exists in the database table
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function serverExists($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('url')
+            ->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+        $statement = $query->execute();
+        $result = $statement->fetchAll();
+        $statement->closeCursor();
+
+        return !empty($result);
+    }
+
+    /**
+     * write token to database. Token is used to exchange the secret
+     *
+     * @param string $url
+     * @param string $token
+     */
+    public function addToken($url, $token) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('token', $query->createParameter('token'))
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash)
+            ->setParameter('token', $token);
+        $query->execute();
+    }
+
+    /**
+     * get token stored in database
+     *
+     * @param string $url
+     * @return string
+     * @throws \Exception
+     */
+    public function getToken($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('token')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $statement = $query->execute();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+
+        if (!isset($result['token'])) {
+            throw new \Exception('No token found for: ' . $url);
+        }
+
+        return $result['token'];
+    }
+
+    /**
+     * add shared Secret to database
+     *
+     * @param string $url
+     * @param string $sharedSecret
+     */
+    public function addSharedSecret($url, $sharedSecret) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('shared_secret', $query->createParameter('sharedSecret'))
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash)
+            ->setParameter('sharedSecret', $sharedSecret);
+        $query->execute();
+    }
+
+    /**
+     * get shared secret from database
+     *
+     * @param string $url
+     * @return string
+     */
+    public function getSharedSecret($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('shared_secret')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $statement = $query->execute();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return $result['shared_secret'];
+    }
+
+    /**
+     * set server status
+     *
+     * @param string $url
+     * @param int $status
+     * @param string|null $token
+     */
+    public function setServerStatus($url, $status, $token = null) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+                ->set('status', $query->createNamedParameter($status))
+                ->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash)));
+        if (!is_null($token)) {
+            $query->set('sync_token', $query->createNamedParameter($token));
+        }
+        $query->execute();
+    }
+
+    /**
+     * get server status
+     *
+     * @param string $url
+     * @return int
+     */
+    public function getServerStatus($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('status')->from($this->dbTable)
+                ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+                ->setParameter('url_hash', $hash);
+
+        $statement = $query->execute();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return (int)$result['status'];
+    }
+
+    /**
+     * create hash from URL
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function hash($url) {
+        $normalized = $this->normalizeUrl($url);
+        return sha1($normalized);
+    }
+
+    /**
+     * normalize URL, used to create the sha1 hash
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function normalizeUrl($url) {
+        $normalized = $url;
+
+        if (strpos($url, 'https://') === 0) {
+            $normalized = substr($url, strlen('https://'));
+        } else if (strpos($url, 'http://') === 0) {
+            $normalized = substr($url, strlen('http://'));
+        }
+
+        $normalized = Filesystem::normalizePath($normalized);
+        $normalized = trim($normalized, '/');
+
+        return $normalized;
+    }
+
+    /**
+     * @param $username
+     * @param $password
+     * @return bool
+     */
+    public function auth($username, $password) {
+        if ($username !== 'system') {
+            return false;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('url')->from($this->dbTable)
+                ->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password)));
+
+        $statement = $query->execute();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return !empty($result);
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -87,10 +87,10 @@ 
 		$result = $query->execute();
 
 		if ($result) {
-			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
+			return (int) $this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
 		}
 
-		$message = 'Internal failure, Could not add trusted server: ' . $url;
+		$message = 'Internal failure, Could not add trusted server: '.$url;
 		$message_t = $this->IL10N->t('Could not add server');
 		throw new HintException($message, $message_t);
 	}
@@ -124,7 +124,7 @@ 
 		$result = $query->execute()->fetchAll();
 
 		if (empty($result)) {
-			throw new \Exception('No Server found with ID: ' . $id);
+			throw new \Exception('No Server found with ID: '.$id);
 		}
 
 		return $result[0];
@@ -201,7 +201,7 @@ 
 		$statement->closeCursor();
 
 		if (!isset($result['token'])) {
-			throw new \Exception('No token found for: ' . $url);
+			throw new \Exception('No token found for: '.$url);
 		}
 
 		return $result['token'];
@@ -278,7 +278,7 @@ 
 		$statement = $query->execute();
 		$result = $statement->fetch();
 		$statement->closeCursor();
-		return (int)$result['status'];
+		return (int) $result['status'];
 	}
 
 	/**

apps/federation/lib/AppInfo/Application.php

Indentation +38 added lines, -38 removed lines

@@ -35,48 +35,48 @@
 
 class Application extends App {
 
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct($urlParams = []) {
-		parent::__construct('federation', $urlParams);
-		$this->registerMiddleware();
-	}
+    /**
+     * @param array $urlParams
+     */
+    public function __construct($urlParams = []) {
+        parent::__construct('federation', $urlParams);
+        $this->registerMiddleware();
+    }
 
-	private function registerMiddleware() {
-		$container = $this->getContainer();
-		$container->registerAlias('AddServerMiddleware', AddServerMiddleware::class);
-		$container->registerMiddleWare('AddServerMiddleware');
-	}
+    private function registerMiddleware() {
+        $container = $this->getContainer();
+        $container->registerAlias('AddServerMiddleware', AddServerMiddleware::class);
+        $container->registerMiddleWare('AddServerMiddleware');
+    }
 
-	/**
-	 * listen to federated_share_added hooks to auto-add new servers to the
-	 * list of trusted servers.
-	 */
-	public function registerHooks() {
+    /**
+     * listen to federated_share_added hooks to auto-add new servers to the
+     * list of trusted servers.
+     */
+    public function registerHooks() {
 
-		$container = $this->getContainer();
-		$hooksManager = $container->query(Hooks::class);
+        $container = $this->getContainer();
+        $hooksManager = $container->query(Hooks::class);
 
-		Util::connectHook(
-				'OCP\Share',
-				'federated_share_added',
-				$hooksManager,
-				'addServerHook'
-		);
+        Util::connectHook(
+                'OCP\Share',
+                'federated_share_added',
+                $hooksManager,
+                'addServerHook'
+        );
 
-		$dispatcher = $container->getServer()->getEventDispatcher();
-		$dispatcher->addListener('OCA\DAV\Connector\Sabre::authInit', function($event) use($container) {
-			if ($event instanceof SabrePluginEvent) {
-				$server = $event->getServer();
-				if ($server instanceof Server) {
-					$authPlugin = $server->getPlugin('auth');
-					if ($authPlugin instanceof Plugin) {
-						$authPlugin->addBackend($container->query(FedAuth::class));
-					}
-				}
-			}
-		});
-	}
+        $dispatcher = $container->getServer()->getEventDispatcher();
+        $dispatcher->addListener('OCA\DAV\Connector\Sabre::authInit', function($event) use($container) {
+            if ($event instanceof SabrePluginEvent) {
+                $server = $event->getServer();
+                if ($server instanceof Server) {
+                    $authPlugin = $server->getPlugin('auth');
+                    if ($authPlugin instanceof Plugin) {
+                        $authPlugin->addBackend($container->query(FedAuth::class));
+                    }
+                }
+            }
+        });
+    }
 
 }

apps/federation/lib/Command/SyncFederationAddressBooks.php

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;
+    }
 }