nextcloud / server

apps/federation/lib/SyncJob.php

Indentation +19 added lines, -19 removed lines

@@ -12,24 +12,24 @@
 use Psr\Log\LoggerInterface;
 
 class SyncJob extends TimedJob {
-	public function __construct(
-		protected SyncFederationAddressBooks $syncService,
-		protected LoggerInterface $logger,
-		ITimeFactory $timeFactory,
-	) {
-		parent::__construct($timeFactory);
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
+    public function __construct(
+        protected SyncFederationAddressBooks $syncService,
+        protected LoggerInterface $logger,
+        ITimeFactory $timeFactory,
+    ) {
+        parent::__construct($timeFactory);
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
 
-	protected function run($argument) {
-		$this->syncService->syncThemAll(function ($url, $ex): void {
-			if ($ex instanceof \Exception) {
-				$this->logger->error("Error while syncing $url.", [
-					'exception' => $ex,
-				]);
-			}
-		});
-	}
+    protected function run($argument) {
+        $this->syncService->syncThemAll(function ($url, $ex): void {
+            if ($ex instanceof \Exception) {
+                $this->logger->error("Error while syncing $url.", [
+                    'exception' => $ex,
+                ]);
+            }
+        });
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	}
 
 	protected function run($argument) {
-		$this->syncService->syncThemAll(function ($url, $ex): void {
+		$this->syncService->syncThemAll(function($url, $ex): void {
 			if ($ex instanceof \Exception) {
 				$this->logger->error("Error while syncing $url.", [
 					'exception' => $ex,

apps/federation/lib/BackgroundJob/RequestSharedSecret.php

Indentation +139 added lines, -139 removed lines

@@ -31,143 +31,143 @@
  * @package OCA\Federation\Backgroundjob
  */
 class RequestSharedSecret extends Job {
-	private IClient $httpClient;
-
-	protected bool $retainJob = false;
-
-	private string $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret';
-
-	/** @var int 30 day = 2592000sec */
-	private int $maxLifespan = 2592000;
-
-	public function __construct(
-		IClientService $httpClientService,
-		private IURLGenerator $urlGenerator,
-		private IJobList $jobList,
-		private TrustedServers $trustedServers,
-		private IDiscoveryService $ocsDiscoveryService,
-		private LoggerInterface $logger,
-		ITimeFactory $timeFactory,
-		private IConfig $config,
-	) {
-		parent::__construct($timeFactory);
-		$this->httpClient = $httpClientService->newClient();
-	}
-
-
-	/**
-	 * run the job, then remove it from the joblist
-	 */
-	public function start(IJobList $jobList): void {
-		$target = $this->argument['url'];
-		// only execute if target is still in the list of trusted domains
-		if ($this->trustedServers->isTrustedServer($target)) {
-			$this->parentStart($jobList);
-		}
-
-		$jobList->remove($this, $this->argument);
-
-		if ($this->retainJob) {
-			$this->reAddJob($this->argument);
-		}
-	}
-
-	/**
-	 * Call start() method of parent
-	 * Useful for unit tests
-	 */
-	protected function parentStart(IJobList $jobList): void {
-		parent::start($jobList);
-	}
-
-	/**
-	 * @param array $argument
-	 * @return void
-	 */
-	protected function run($argument) {
-		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
-		$currentTime = $this->time->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->logger->warning("The job to request the shared secret job is too old and gets stopped now without retention. Setting server status of '{$target}' to failure.");
-			$this->retainJob = false;
-			$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
-			return;
-		}
-
-		$endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
-		$endPoint = $endPoints['shared-secret'] ?? $this->defaultEndPoint;
-
-		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/');
-
-		try {
-			$result = $this->httpClient->post(
-				$url,
-				[
-					'body' => [
-						'url' => $source,
-						'token' => $token,
-						'format' => 'json',
-					],
-					'timeout' => 3,
-					'connect_timeout' => 3,
-					'verify' => !$this->config->getSystemValue('sharing.federation.allowSelfSignedCertificates', false),
-				]
-			);
-
-			$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.');
-			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage());
-			}
-		} catch (RequestException $e) {
-			$status = -1; // There is no status code if we could not connect
-			$this->logger->info('Could not connect to ' . $target);
-		} catch (\Throwable $e) {
-			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
-		}
-
-		// if we received a unexpected response we try again later
-		if (
-			$status !== Http::STATUS_OK
-			&& ($status !== Http::STATUS_FORBIDDEN || $this->getAttempt($argument) < 5)
-		) {
-			$this->retainJob = true;
-		}
-	}
-
-	/**
-	 * re-add background job
-	 */
-	protected function reAddJob(array $argument): void {
-		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
-		$token = $argument['token'];
-		$attempt = $this->getAttempt($argument) + 1;
-
-		$this->jobList->add(
-			RequestSharedSecret::class,
-			[
-				'url' => $url,
-				'token' => $token,
-				'created' => $created,
-				'attempt' => $attempt
-			]
-		);
-	}
-
-	protected function getAttempt(array $argument): int {
-		return $argument['attempt'] ?? 0;
-	}
+    private IClient $httpClient;
+
+    protected bool $retainJob = false;
+
+    private string $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/request-shared-secret';
+
+    /** @var int 30 day = 2592000sec */
+    private int $maxLifespan = 2592000;
+
+    public function __construct(
+        IClientService $httpClientService,
+        private IURLGenerator $urlGenerator,
+        private IJobList $jobList,
+        private TrustedServers $trustedServers,
+        private IDiscoveryService $ocsDiscoveryService,
+        private LoggerInterface $logger,
+        ITimeFactory $timeFactory,
+        private IConfig $config,
+    ) {
+        parent::__construct($timeFactory);
+        $this->httpClient = $httpClientService->newClient();
+    }
+
+
+    /**
+     * run the job, then remove it from the joblist
+     */
+    public function start(IJobList $jobList): void {
+        $target = $this->argument['url'];
+        // only execute if target is still in the list of trusted domains
+        if ($this->trustedServers->isTrustedServer($target)) {
+            $this->parentStart($jobList);
+        }
+
+        $jobList->remove($this, $this->argument);
+
+        if ($this->retainJob) {
+            $this->reAddJob($this->argument);
+        }
+    }
+
+    /**
+     * Call start() method of parent
+     * Useful for unit tests
+     */
+    protected function parentStart(IJobList $jobList): void {
+        parent::start($jobList);
+    }
+
+    /**
+     * @param array $argument
+     * @return void
+     */
+    protected function run($argument) {
+        $target = $argument['url'];
+        $created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+        $currentTime = $this->time->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->logger->warning("The job to request the shared secret job is too old and gets stopped now without retention. Setting server status of '{$target}' to failure.");
+            $this->retainJob = false;
+            $this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
+            return;
+        }
+
+        $endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
+        $endPoint = $endPoints['shared-secret'] ?? $this->defaultEndPoint;
+
+        // make sure that we have a well formatted url
+        $url = rtrim($target, '/') . '/' . trim($endPoint, '/');
+
+        try {
+            $result = $this->httpClient->post(
+                $url,
+                [
+                    'body' => [
+                        'url' => $source,
+                        'token' => $token,
+                        'format' => 'json',
+                    ],
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                    'verify' => !$this->config->getSystemValue('sharing.federation.allowSelfSignedCertificates', false),
+                ]
+            );
+
+            $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.');
+            } else {
+                $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage());
+            }
+        } catch (RequestException $e) {
+            $status = -1; // There is no status code if we could not connect
+            $this->logger->info('Could not connect to ' . $target);
+        } catch (\Throwable $e) {
+            $status = Http::STATUS_INTERNAL_SERVER_ERROR;
+            $this->logger->error($e->getMessage(), ['exception' => $e]);
+        }
+
+        // if we received a unexpected response we try again later
+        if (
+            $status !== Http::STATUS_OK
+            && ($status !== Http::STATUS_FORBIDDEN || $this->getAttempt($argument) < 5)
+        ) {
+            $this->retainJob = true;
+        }
+    }
+
+    /**
+     * re-add background job
+     */
+    protected function reAddJob(array $argument): void {
+        $url = $argument['url'];
+        $created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+        $token = $argument['token'];
+        $attempt = $this->getAttempt($argument) + 1;
+
+        $this->jobList->add(
+            RequestSharedSecret::class,
+            [
+                'url' => $url,
+                'token' => $token,
+                'created' => $created,
+                'attempt' => $attempt
+            ]
+        );
+    }
+
+    protected function getAttempt(array $argument): int {
+        return $argument['attempt'] ?? 0;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
 	 */
 	protected function run($argument) {
 		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->time->getTime();
 		$currentTime = $this->time->getTime();
 		$source = $this->urlGenerator->getAbsoluteURL('/');
 		$source = rtrim($source, '/');
@@ -105,7 +105,7 @@ 
 		$endPoint = $endPoints['shared-secret'] ?? $this->defaultEndPoint;
 
 		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/');
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/');
 
 		try {
 			$result = $this->httpClient->post(
@@ -126,13 +126,13 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to ask for a shared secret.');
+				$this->logger->info($target.' refused to ask for a shared secret.');
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage());
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage());
 			}
 		} catch (RequestException $e) {
 			$status = -1; // There is no status code if we could not connect
-			$this->logger->info('Could not connect to ' . $target);
+			$this->logger->info('Could not connect to '.$target);
 		} catch (\Throwable $e) {
 			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
@@ -152,7 +152,7 @@ 
 	 */
 	protected function reAddJob(array $argument): void {
 		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->time->getTime();
 		$token = $argument['token'];
 		$attempt = $this->getAttempt($argument) + 1;
 

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Indentation +144 added lines, -144 removed lines

@@ -30,148 +30,148 @@
  * @package OCA\Federation\Backgroundjob
  */
 class GetSharedSecret extends Job {
-	private IClient $httpClient;
-	protected bool $retainJob = false;
-	private string $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
-	/** 30 day = 2592000sec */
-	private int $maxLifespan = 2592000;
-
-	public function __construct(
-		IClientService $httpClientService,
-		private IURLGenerator $urlGenerator,
-		private IJobList $jobList,
-		private TrustedServers $trustedServers,
-		private LoggerInterface $logger,
-		private IDiscoveryService $ocsDiscoveryService,
-		ITimeFactory $timeFactory,
-		private IConfig $config,
-	) {
-		parent::__construct($timeFactory);
-		$this->httpClient = $httpClientService->newClient();
-	}
-
-	/**
-	 * Run the job, then remove it from the joblist
-	 */
-	public function start(IJobList $jobList): void {
-		$target = $this->argument['url'];
-		// only execute if target is still in the list of trusted domains
-		if ($this->trustedServers->isTrustedServer($target)) {
-			$this->parentStart($jobList);
-		}
-
-		$jobList->remove($this, $this->argument);
-
-		if ($this->retainJob) {
-			$this->reAddJob($this->argument);
-		}
-	}
-
-	protected function parentStart(IJobList $jobList): void {
-		parent::start($jobList);
-	}
-
-	protected function run($argument) {
-		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
-		$currentTime = $this->time->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->logger->warning("The job to get the shared secret job is too old and gets stopped now without retention. Setting server status of '{$target}' to failure.");
-			$this->retainJob = false;
-			$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
-			return;
-		}
-
-		$endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
-		$endPoint = $endPoints['shared-secret'] ?? $this->defaultEndPoint;
-
-		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/');
-
-		$result = null;
-		try {
-			$result = $this->httpClient->get(
-				$url,
-				[
-					'query' =>
-						[
-							'url' => $source,
-							'token' => $token,
-							'format' => 'json',
-						],
-					'timeout' => 3,
-					'connect_timeout' => 3,
-					'verify' => !$this->config->getSystemValue('sharing.federation.allowSelfSignedCertificates', false),
-				]
-			);
-
-			$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.');
-			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage());
-			}
-		} catch (RequestException $e) {
-			$status = -1; // There is no status code if we could not connect
-			$this->logger->info('Could not connect to ' . $target, [
-				'exception' => $e,
-			]);
-		} catch (\Throwable $e) {
-			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
-			$this->logger->error($e->getMessage(), [
-				'exception' => $e,
-			]);
-		}
-
-		// 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_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. Received data: ' . $body
-				);
-				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
-			}
-		}
-	}
-
-	/**
-	 * Re-add background job
-	 *
-	 * @param array $argument
-	 */
-	protected function reAddJob(array $argument): void {
-		$url = $argument['url'];
-		$created = $argument['created'] ?? $this->time->getTime();
-		$token = $argument['token'];
-		$this->jobList->add(
-			GetSharedSecret::class,
-			[
-				'url' => $url,
-				'token' => $token,
-				'created' => $created
-			]
-		);
-	}
+    private IClient $httpClient;
+    protected bool $retainJob = false;
+    private string $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
+    /** 30 day = 2592000sec */
+    private int $maxLifespan = 2592000;
+
+    public function __construct(
+        IClientService $httpClientService,
+        private IURLGenerator $urlGenerator,
+        private IJobList $jobList,
+        private TrustedServers $trustedServers,
+        private LoggerInterface $logger,
+        private IDiscoveryService $ocsDiscoveryService,
+        ITimeFactory $timeFactory,
+        private IConfig $config,
+    ) {
+        parent::__construct($timeFactory);
+        $this->httpClient = $httpClientService->newClient();
+    }
+
+    /**
+     * Run the job, then remove it from the joblist
+     */
+    public function start(IJobList $jobList): void {
+        $target = $this->argument['url'];
+        // only execute if target is still in the list of trusted domains
+        if ($this->trustedServers->isTrustedServer($target)) {
+            $this->parentStart($jobList);
+        }
+
+        $jobList->remove($this, $this->argument);
+
+        if ($this->retainJob) {
+            $this->reAddJob($this->argument);
+        }
+    }
+
+    protected function parentStart(IJobList $jobList): void {
+        parent::start($jobList);
+    }
+
+    protected function run($argument) {
+        $target = $argument['url'];
+        $created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+        $currentTime = $this->time->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->logger->warning("The job to get the shared secret job is too old and gets stopped now without retention. Setting server status of '{$target}' to failure.");
+            $this->retainJob = false;
+            $this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
+            return;
+        }
+
+        $endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
+        $endPoint = $endPoints['shared-secret'] ?? $this->defaultEndPoint;
+
+        // make sure that we have a well formatted url
+        $url = rtrim($target, '/') . '/' . trim($endPoint, '/');
+
+        $result = null;
+        try {
+            $result = $this->httpClient->get(
+                $url,
+                [
+                    'query' =>
+                        [
+                            'url' => $source,
+                            'token' => $token,
+                            'format' => 'json',
+                        ],
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                    'verify' => !$this->config->getSystemValue('sharing.federation.allowSelfSignedCertificates', false),
+                ]
+            );
+
+            $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.');
+            } else {
+                $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage());
+            }
+        } catch (RequestException $e) {
+            $status = -1; // There is no status code if we could not connect
+            $this->logger->info('Could not connect to ' . $target, [
+                'exception' => $e,
+            ]);
+        } catch (\Throwable $e) {
+            $status = Http::STATUS_INTERNAL_SERVER_ERROR;
+            $this->logger->error($e->getMessage(), [
+                'exception' => $e,
+            ]);
+        }
+
+        // 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_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. Received data: ' . $body
+                );
+                $this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
+            }
+        }
+    }
+
+    /**
+     * Re-add background job
+     *
+     * @param array $argument
+     */
+    protected function reAddJob(array $argument): void {
+        $url = $argument['url'];
+        $created = $argument['created'] ?? $this->time->getTime();
+        $token = $argument['token'];
+        $this->jobList->add(
+            GetSharedSecret::class,
+            [
+                'url' => $url,
+                'token' => $token,
+                'created' => $created
+            ]
+        );
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -73,7 +73,7 @@ 
 
 	protected function run($argument) {
 		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->time->getTime();
 		$currentTime = $this->time->getTime();
 		$source = $this->urlGenerator->getAbsoluteURL('/');
 		$source = rtrim($source, '/');
@@ -92,7 +92,7 @@ 
 		$endPoint = $endPoints['shared-secret'] ?? $this->defaultEndPoint;
 
 		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/');
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/');
 
 		$result = null;
 		try {
@@ -115,13 +115,13 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.');
+				$this->logger->info($target.' refused to exchange a shared secret with you.');
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage());
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage());
 			}
 		} catch (RequestException $e) {
 			$status = -1; // There is no status code if we could not connect
-			$this->logger->info('Could not connect to ' . $target, [
+			$this->logger->info('Could not connect to '.$target, [
 				'exception' => $e,
 			]);
 		} catch (\Throwable $e) {
@@ -149,7 +149,7 @@ 
 				);
 			} else {
 				$this->logger->error(
-					'remote server "' . $target . '"" does not return a valid shared secret. Received data: ' . $body
+					'remote server "'.$target.'"" does not return a valid shared secret. Received data: '.$body
 				);
 				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
 			}

apps/federation/lib/Controller/OCSAuthAPIController.php

Indentation +133 added lines, -133 removed lines

@@ -33,137 +33,137 @@
  */
 #[OpenAPI(scope: OpenAPI::SCOPE_FEDERATION)]
 class OCSAuthAPIController extends OCSController {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private ISecureRandom $secureRandom,
-		private IJobList $jobList,
-		private TrustedServers $trustedServers,
-		private DbHandler $dbHandler,
-		private LoggerInterface $logger,
-		private ITimeFactory $timeFactory,
-		private IThrottler $throttler,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * Request received to ask remote server for a shared secret, for legacy end-points
-	 *
-	 * @param string $url URL of the server
-	 * @param string $token Token of the server
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSForbiddenException Requesting shared secret is not allowed
-	 *
-	 * 200: Shared secret requested successfully
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[BruteForceProtection(action: 'federationSharedSecret')]
-	public function requestSharedSecretLegacy(string $url, string $token): DataResponse {
-		return $this->requestSharedSecret($url, $token);
-	}
-
-
-	/**
-	 * Create shared secret and return it, for legacy end-points
-	 *
-	 * @param string $url URL of the server
-	 * @param string $token Token of the server
-	 * @return DataResponse<Http::STATUS_OK, array{sharedSecret: string}, array{}>
-	 * @throws OCSForbiddenException Getting shared secret is not allowed
-	 *
-	 * 200: Shared secret returned
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[BruteForceProtection(action: 'federationSharedSecret')]
-	public function getSharedSecretLegacy(string $url, string $token): DataResponse {
-		return $this->getSharedSecret($url, $token);
-	}
-
-	/**
-	 * Request received to ask remote server for a shared secret
-	 *
-	 * @param string $url URL of the server
-	 * @param string $token Token of the server
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSForbiddenException Requesting shared secret is not allowed
-	 *
-	 * 200: Shared secret requested successfully
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[BruteForceProtection(action: 'federationSharedSecret')]
-	public function requestSharedSecret(string $url, string $token): DataResponse {
-		if ($this->trustedServers->isTrustedServer($url) === false) {
-			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
-			$this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret');
-			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.'
-			);
-			throw new OCSForbiddenException();
-		}
-
-		$this->jobList->add(
-			'OCA\Federation\BackgroundJob\GetSharedSecret',
-			[
-				'url' => $url,
-				'token' => $token,
-				'created' => $this->timeFactory->getTime()
-			]
-		);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Create shared secret and return it
-	 *
-	 * @param string $url URL of the server
-	 * @param string $token Token of the server
-	 * @return DataResponse<Http::STATUS_OK, array{sharedSecret: string}, array{}>
-	 * @throws OCSForbiddenException Getting shared secret is not allowed
-	 *
-	 * 200: Shared secret returned
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[BruteForceProtection(action: 'federationSharedSecret')]
-	public function getSharedSecret(string $url, string $token): DataResponse {
-		if ($this->trustedServers->isTrustedServer($url) === false) {
-			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
-			$this->logger->error('remote server not trusted (' . $url . ') while getting shared secret');
-			throw new OCSForbiddenException();
-		}
-
-		if ($this->isValidToken($url, $token) === false) {
-			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
-			$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'
-			);
-			throw new OCSForbiddenException();
-		}
-
-		$sharedSecret = $this->secureRandom->generate(32);
-
-		$this->trustedServers->addSharedSecret($url, $sharedSecret);
-
-		return new DataResponse([
-			'sharedSecret' => $sharedSecret
-		]);
-	}
-
-	protected function isValidToken(string $url, string $token): bool {
-		$storedToken = $this->dbHandler->getToken($url);
-		return hash_equals($storedToken, $token);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private ISecureRandom $secureRandom,
+        private IJobList $jobList,
+        private TrustedServers $trustedServers,
+        private DbHandler $dbHandler,
+        private LoggerInterface $logger,
+        private ITimeFactory $timeFactory,
+        private IThrottler $throttler,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * Request received to ask remote server for a shared secret, for legacy end-points
+     *
+     * @param string $url URL of the server
+     * @param string $token Token of the server
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSForbiddenException Requesting shared secret is not allowed
+     *
+     * 200: Shared secret requested successfully
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[BruteForceProtection(action: 'federationSharedSecret')]
+    public function requestSharedSecretLegacy(string $url, string $token): DataResponse {
+        return $this->requestSharedSecret($url, $token);
+    }
+
+
+    /**
+     * Create shared secret and return it, for legacy end-points
+     *
+     * @param string $url URL of the server
+     * @param string $token Token of the server
+     * @return DataResponse<Http::STATUS_OK, array{sharedSecret: string}, array{}>
+     * @throws OCSForbiddenException Getting shared secret is not allowed
+     *
+     * 200: Shared secret returned
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[BruteForceProtection(action: 'federationSharedSecret')]
+    public function getSharedSecretLegacy(string $url, string $token): DataResponse {
+        return $this->getSharedSecret($url, $token);
+    }
+
+    /**
+     * Request received to ask remote server for a shared secret
+     *
+     * @param string $url URL of the server
+     * @param string $token Token of the server
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSForbiddenException Requesting shared secret is not allowed
+     *
+     * 200: Shared secret requested successfully
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[BruteForceProtection(action: 'federationSharedSecret')]
+    public function requestSharedSecret(string $url, string $token): DataResponse {
+        if ($this->trustedServers->isTrustedServer($url) === false) {
+            $this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
+            $this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret');
+            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.'
+            );
+            throw new OCSForbiddenException();
+        }
+
+        $this->jobList->add(
+            'OCA\Federation\BackgroundJob\GetSharedSecret',
+            [
+                'url' => $url,
+                'token' => $token,
+                'created' => $this->timeFactory->getTime()
+            ]
+        );
+
+        return new DataResponse();
+    }
+
+    /**
+     * Create shared secret and return it
+     *
+     * @param string $url URL of the server
+     * @param string $token Token of the server
+     * @return DataResponse<Http::STATUS_OK, array{sharedSecret: string}, array{}>
+     * @throws OCSForbiddenException Getting shared secret is not allowed
+     *
+     * 200: Shared secret returned
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[BruteForceProtection(action: 'federationSharedSecret')]
+    public function getSharedSecret(string $url, string $token): DataResponse {
+        if ($this->trustedServers->isTrustedServer($url) === false) {
+            $this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
+            $this->logger->error('remote server not trusted (' . $url . ') while getting shared secret');
+            throw new OCSForbiddenException();
+        }
+
+        if ($this->isValidToken($url, $token) === false) {
+            $this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
+            $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'
+            );
+            throw new OCSForbiddenException();
+        }
+
+        $sharedSecret = $this->secureRandom->generate(32);
+
+        $this->trustedServers->addSharedSecret($url, $sharedSecret);
+
+        return new DataResponse([
+            'sharedSecret' => $sharedSecret
+        ]);
+    }
+
+    protected function isValidToken(string $url, string $token): bool {
+        $storedToken = $this->dbHandler->getToken($url);
+        return hash_equals($storedToken, $token);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -98,7 +98,7 @@ 
 	public function requestSharedSecret(string $url, string $token): DataResponse {
 		if ($this->trustedServers->isTrustedServer($url) === false) {
 			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
-			$this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret');
+			$this->logger->error('remote server not trusted ('.$url.') while requesting shared secret');
 			throw new OCSForbiddenException();
 		}
 
@@ -107,7 +107,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.'
 			);
 			throw new OCSForbiddenException();
 		}
@@ -140,7 +140,7 @@ 
 	public function getSharedSecret(string $url, string $token): DataResponse {
 		if ($this->trustedServers->isTrustedServer($url) === false) {
 			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
-			$this->logger->error('remote server not trusted (' . $url . ') while getting shared secret');
+			$this->logger->error('remote server not trusted ('.$url.') while getting shared secret');
 			throw new OCSForbiddenException();
 		}
 
@@ -148,7 +148,7 @@ 
 			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
 			$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'
 			);
 			throw new OCSForbiddenException();
 		}

apps/federation/lib/TrustedServers.php

Indentation +183 added lines, -183 removed lines

@@ -22,187 +22,187 @@
 
 class TrustedServers {
 
-	/** after a user list was exchanged at least once successfully */
-	public const STATUS_OK = 1;
-	/** waiting for shared secret or initial user list exchange */
-	public const STATUS_PENDING = 2;
-	/** something went wrong, misconfigured server, software bug,... user interaction needed */
-	public const STATUS_FAILURE = 3;
-	/** remote server revoked access */
-	public const STATUS_ACCESS_REVOKED = 4;
-
-	/** @var list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>|null */
-	private ?array $trustedServersCache = null;
-
-	public function __construct(
-		private DbHandler $dbHandler,
-		private IClientService $httpClientService,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		private ISecureRandom $secureRandom,
-		private IConfig $config,
-		private IEventDispatcher $dispatcher,
-		private ITimeFactory $timeFactory,
-	) {
-	}
-
-	/**
-	 * Add server to the list of trusted servers
-	 */
-	public function addServer(string $url): int {
-		$url = $this->updateProtocol($url);
-		$result = $this->dbHandler->addServer($url);
-		if ($result) {
-			$token = $this->secureRandom->generate(16);
-			$this->dbHandler->addToken($url, $token);
-			$this->jobList->add(
-				RequestSharedSecret::class,
-				[
-					'url' => $url,
-					'token' => $token,
-					'created' => $this->timeFactory->getTime()
-				]
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get shared secret for the given server
-	 */
-	public function getSharedSecret(string $url): string {
-		return $this->dbHandler->getSharedSecret($url);
-	}
-
-	/**
-	 * Add shared secret for the given server
-	 */
-	public function addSharedSecret(string $url, string $sharedSecret): void {
-		$this->dbHandler->addSharedSecret($url, $sharedSecret);
-	}
-
-	/**
-	 * Remove server from the list of trusted servers
-	 */
-	public function removeServer(int $id): void {
-		$server = $this->dbHandler->getServerById($id);
-		$this->dbHandler->removeServer($id);
-		$this->dispatcher->dispatchTyped(new TrustedServerRemovedEvent($server['url_hash']));
-
-	}
-
-	/**
-	 * Get all trusted servers
-	 *
-	 * @return list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>
-	 * @throws \Exception
-	 */
-	public function getServers(): ?array {
-		if ($this->trustedServersCache === null) {
-			$this->trustedServersCache = $this->dbHandler->getAllServer();
-		}
-		return $this->trustedServersCache;
-	}
-
-	/**
-	 * Get a trusted server
-	 *
-	 * @return array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}
-	 * @throws Exception
-	 */
-	public function getServer(int $id): ?array {
-		if ($this->trustedServersCache === null) {
-			$this->trustedServersCache = $this->dbHandler->getAllServer();
-		}
-
-		$server = array_filter($this->trustedServersCache, fn ($server) => $server['id'] === $id);
-		if (empty($server)) {
-			throw new \Exception('No server found with ID: ' . $id);
-		}
-
-		return $server[0];
-	}
-
-	/**
-	 * Check if given server is a trusted Nextcloud server
-	 */
-	public function isTrustedServer(string $url): bool {
-		return $this->dbHandler->serverExists($url);
-	}
-
-	/**
-	 * Set server status
-	 */
-	public function setServerStatus(string $url, int $status): void {
-		$this->dbHandler->setServerStatus($url, $status);
-	}
-
-	/**
-	 * Get server status
-	 */
-	public function getServerStatus(string $url): int {
-		return $this->dbHandler->getServerStatus($url);
-	}
-
-	/**
-	 * Check if URL point to a ownCloud/Nextcloud server
-	 */
-	public function isNextcloudServer(string $url): bool {
-		$isValidNextcloud = false;
-		$client = $this->httpClientService->newClient();
-		try {
-			$result = $client->get(
-				$url . '/status.php',
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-					'verify' => !$this->config->getSystemValue('sharing.federation.allowSelfSignedCertificates', false),
-				]
-			);
-			if ($result->getStatusCode() === Http::STATUS_OK) {
-				$body = $result->getBody();
-				if (is_resource($body)) {
-					$body = stream_get_contents($body) ?: '';
-				}
-				$isValidNextcloud = $this->checkNextcloudVersion($body);
-			}
-		} catch (\Exception $e) {
-			$this->logger->error('No Nextcloud server.', [
-				'exception' => $e,
-			]);
-			return false;
-		}
-
-		return $isValidNextcloud;
-	}
-
-	/**
-	 * Check if ownCloud/Nextcloud version is >= 9.0
-	 * @throws HintException
-	 */
-	protected function checkNextcloudVersion(string $status): bool {
-		$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
-	 */
-	protected function updateProtocol(string $url): string {
-		if (
-			strpos($url, 'https://') === 0
-			|| strpos($url, 'http://') === 0
-		) {
-			return $url;
-		}
-
-		return 'https://' . $url;
-	}
+    /** after a user list was exchanged at least once successfully */
+    public const STATUS_OK = 1;
+    /** waiting for shared secret or initial user list exchange */
+    public const STATUS_PENDING = 2;
+    /** something went wrong, misconfigured server, software bug,... user interaction needed */
+    public const STATUS_FAILURE = 3;
+    /** remote server revoked access */
+    public const STATUS_ACCESS_REVOKED = 4;
+
+    /** @var list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>|null */
+    private ?array $trustedServersCache = null;
+
+    public function __construct(
+        private DbHandler $dbHandler,
+        private IClientService $httpClientService,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        private ISecureRandom $secureRandom,
+        private IConfig $config,
+        private IEventDispatcher $dispatcher,
+        private ITimeFactory $timeFactory,
+    ) {
+    }
+
+    /**
+     * Add server to the list of trusted servers
+     */
+    public function addServer(string $url): int {
+        $url = $this->updateProtocol($url);
+        $result = $this->dbHandler->addServer($url);
+        if ($result) {
+            $token = $this->secureRandom->generate(16);
+            $this->dbHandler->addToken($url, $token);
+            $this->jobList->add(
+                RequestSharedSecret::class,
+                [
+                    'url' => $url,
+                    'token' => $token,
+                    'created' => $this->timeFactory->getTime()
+                ]
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get shared secret for the given server
+     */
+    public function getSharedSecret(string $url): string {
+        return $this->dbHandler->getSharedSecret($url);
+    }
+
+    /**
+     * Add shared secret for the given server
+     */
+    public function addSharedSecret(string $url, string $sharedSecret): void {
+        $this->dbHandler->addSharedSecret($url, $sharedSecret);
+    }
+
+    /**
+     * Remove server from the list of trusted servers
+     */
+    public function removeServer(int $id): void {
+        $server = $this->dbHandler->getServerById($id);
+        $this->dbHandler->removeServer($id);
+        $this->dispatcher->dispatchTyped(new TrustedServerRemovedEvent($server['url_hash']));
+
+    }
+
+    /**
+     * Get all trusted servers
+     *
+     * @return list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>
+     * @throws \Exception
+     */
+    public function getServers(): ?array {
+        if ($this->trustedServersCache === null) {
+            $this->trustedServersCache = $this->dbHandler->getAllServer();
+        }
+        return $this->trustedServersCache;
+    }
+
+    /**
+     * Get a trusted server
+     *
+     * @return array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}
+     * @throws Exception
+     */
+    public function getServer(int $id): ?array {
+        if ($this->trustedServersCache === null) {
+            $this->trustedServersCache = $this->dbHandler->getAllServer();
+        }
+
+        $server = array_filter($this->trustedServersCache, fn ($server) => $server['id'] === $id);
+        if (empty($server)) {
+            throw new \Exception('No server found with ID: ' . $id);
+        }
+
+        return $server[0];
+    }
+
+    /**
+     * Check if given server is a trusted Nextcloud server
+     */
+    public function isTrustedServer(string $url): bool {
+        return $this->dbHandler->serverExists($url);
+    }
+
+    /**
+     * Set server status
+     */
+    public function setServerStatus(string $url, int $status): void {
+        $this->dbHandler->setServerStatus($url, $status);
+    }
+
+    /**
+     * Get server status
+     */
+    public function getServerStatus(string $url): int {
+        return $this->dbHandler->getServerStatus($url);
+    }
+
+    /**
+     * Check if URL point to a ownCloud/Nextcloud server
+     */
+    public function isNextcloudServer(string $url): bool {
+        $isValidNextcloud = false;
+        $client = $this->httpClientService->newClient();
+        try {
+            $result = $client->get(
+                $url . '/status.php',
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                    'verify' => !$this->config->getSystemValue('sharing.federation.allowSelfSignedCertificates', false),
+                ]
+            );
+            if ($result->getStatusCode() === Http::STATUS_OK) {
+                $body = $result->getBody();
+                if (is_resource($body)) {
+                    $body = stream_get_contents($body) ?: '';
+                }
+                $isValidNextcloud = $this->checkNextcloudVersion($body);
+            }
+        } catch (\Exception $e) {
+            $this->logger->error('No Nextcloud server.', [
+                'exception' => $e,
+            ]);
+            return false;
+        }
+
+        return $isValidNextcloud;
+    }
+
+    /**
+     * Check if ownCloud/Nextcloud version is >= 9.0
+     * @throws HintException
+     */
+    protected function checkNextcloudVersion(string $status): bool {
+        $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
+     */
+    protected function updateProtocol(string $url): string {
+        if (
+            strpos($url, 'https://') === 0
+            || strpos($url, 'http://') === 0
+        ) {
+            return $url;
+        }
+
+        return 'https://' . $url;
+    }
 }