nextcloud / server

apps/federation/lib/TrustedServers.php

Indentation +184 added lines, -184 removed lines

@@ -22,188 +22,188 @@
 
 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();
-		}
-
-		foreach ($this->trustedServersCache as $server) {
-			if ($server['id'] === $id) {
-				return $server;
-			}
-		}
-
-		throw new \Exception('No server found with ID: ' . $id);
-	}
-
-	/**
-	 * 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();
+        }
+
+        foreach ($this->trustedServersCache as $server) {
+            if ($server['id'] === $id) {
+                return $server;
+            }
+        }
+
+        throw new \Exception('No server found with ID: ' . $id);
+    }
+
+    /**
+     * 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;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
 			}
 		}
 
-		throw new \Exception('No server found with ID: ' . $id);
+		throw new \Exception('No server found with ID: '.$id);
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 		$client = $this->httpClientService->newClient();
 		try {
 			$result = $client->get(
-				$url . '/status.php',
+				$url.'/status.php',
 				[
 					'timeout' => 3,
 					'connect_timeout' => 3,
@@ -204,6 +204,6 @@ 
 			return $url;
 		}
 
-		return 'https://' . $url;
+		return 'https://'.$url;
 	}
 }

apps/federation/tests/TrustedServersTest.php

Indentation +310 added lines, -310 removed lines

@@ -26,314 +26,314 @@
 use Test\TestCase;
 
 class TrustedServersTest extends TestCase {
-	private TrustedServers $trustedServers;
-	private DbHandler&MockObject $dbHandler;
-	private IClientService&MockObject $httpClientService;
-	private IClient&MockObject $httpClient;
-	private IResponse&MockObject $response;
-	private LoggerInterface&MockObject $logger;
-	private IJobList&MockObject $jobList;
-	private ISecureRandom&MockObject $secureRandom;
-	private IConfig&MockObject $config;
-	private IEventDispatcher&MockObject $dispatcher;
-	private ITimeFactory&MockObject $timeFactory;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->dbHandler = $this->createMock(DbHandler::class);
-		$this->dispatcher = $this->createMock(IEventDispatcher::class);
-		$this->httpClientService = $this->createMock(IClientService::class);
-		$this->httpClient = $this->createMock(IClient::class);
-		$this->response = $this->createMock(IResponse::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->jobList = $this->createMock(IJobList::class);
-		$this->secureRandom = $this->createMock(ISecureRandom::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-
-		$this->trustedServers = new TrustedServers(
-			$this->dbHandler,
-			$this->httpClientService,
-			$this->logger,
-			$this->jobList,
-			$this->secureRandom,
-			$this->config,
-			$this->dispatcher,
-			$this->timeFactory
-		);
-	}
-
-	public function testAddServer(): void {
-		/** @var TrustedServers&MockObject $trustedServers */
-		$trustedServers = $this->getMockBuilder(TrustedServers::class)
-			->setConstructorArgs(
-				[
-					$this->dbHandler,
-					$this->httpClientService,
-					$this->logger,
-					$this->jobList,
-					$this->secureRandom,
-					$this->config,
-					$this->dispatcher,
-					$this->timeFactory
-				]
-			)
-			->onlyMethods(['updateProtocol'])
-			->getMock();
-		$trustedServers->expects($this->once())->method('updateProtocol')
-			->with('url')->willReturn('https://url');
-		$this->timeFactory->method('getTime')
-			->willReturn(1234567);
-		$this->dbHandler->expects($this->once())->method('addServer')->with('https://url')
-			->willReturn(1);
-
-		$this->secureRandom->expects($this->once())->method('generate')
-			->willReturn('token');
-		$this->dbHandler->expects($this->once())->method('addToken')->with('https://url', 'token');
-		$this->jobList->expects($this->once())->method('add')
-			->with(RequestSharedSecret::class,
-				['url' => 'https://url', 'token' => 'token', 'created' => 1234567]);
-
-		$this->assertSame(
-			1,
-			$trustedServers->addServer('url')
-		);
-	}
-
-	public function testAddSharedSecret(): void {
-		$this->dbHandler->expects($this->once())->method('addSharedSecret')
-			->with('url', 'secret');
-		$this->trustedServers->addSharedSecret('url', 'secret');
-	}
-
-	public function testGetSharedSecret(): void {
-		$this->dbHandler->expects($this->once())
-			->method('getSharedSecret')
-			->with('url')
-			->willReturn('secret');
-		$this->assertSame(
-			$this->trustedServers->getSharedSecret('url'),
-			'secret'
-		);
-	}
-
-	public function testRemoveServer(): void {
-		$id = 42;
-		$server = ['url_hash' => 'url_hash'];
-		$this->dbHandler->expects($this->once())->method('removeServer')->with($id);
-		$this->dbHandler->expects($this->once())->method('getServerById')->with($id)
-			->willReturn($server);
-		$this->dispatcher->expects($this->once())->method('dispatchTyped')
-			->willReturnCallback(
-				function ($event): void {
-					$this->assertSame(get_class($event), TrustedServerRemovedEvent::class);
-					/** @var \OCP\Federated\Events\TrustedServerRemovedEvent $event */
-					$this->assertSame('url_hash', $event->getUrlHash());
-				}
-			);
-		$this->trustedServers->removeServer($id);
-	}
-
-	public function testGetServers(): void {
-		$this->dbHandler->expects($this->once())->method('getAllServer')->willReturn(['servers']);
-
-		$this->assertEquals(
-			['servers'],
-			$this->trustedServers->getServers()
-		);
-	}
-
-	public static function dataTestGetServer() {
-		return [
-			[
-				15,
-				[
-					'id' => 15,
-					'otherData' => 'first server',
-				]
-			],
-			[
-				16,
-				[
-					'id' => 16,
-					'otherData' => 'second server',
-				]
-			],
-			[
-				42,
-				[
-					'id' => 42,
-					'otherData' => 'last server',
-				]
-			],
-			[
-				108,
-				null
-			],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetServer')]
-	public function testGetServer(int $id, ?array $expectedServer): void {
-		$servers = [
-			[
-				'id' => 15,
-				'otherData' => 'first server',
-			],
-			[
-				'id' => 16,
-				'otherData' => 'second server',
-			],
-			[
-				'id' => 42,
-				'otherData' => 'last server',
-			],
-		];
-		$this->dbHandler->expects($this->once())->method('getAllServer')->willReturn($servers);
-
-		if ($expectedServer === null) {
-			$this->expectException(\Exception::class);
-			$this->expectExceptionMessage('No server found with ID: ' . $id);
-		}
-
-		$this->assertEquals(
-			$expectedServer,
-			$this->trustedServers->getServer($id)
-		);
-	}
-
-	public function testIsTrustedServer(): void {
-		$this->dbHandler->expects($this->once())
-			->method('serverExists')->with('url')
-			->willReturn(true);
-
-		$this->assertTrue(
-			$this->trustedServers->isTrustedServer('url')
-		);
-	}
-
-	public function testSetServerStatus(): void {
-		$this->dbHandler->expects($this->once())->method('setServerStatus')
-			->with('url', 1);
-		$this->trustedServers->setServerStatus('url', 1);
-	}
-
-	public function testGetServerStatus(): void {
-		$this->dbHandler->expects($this->once())->method('getServerStatus')
-			->with('url')->willReturn(1);
-		$this->assertSame(
-			$this->trustedServers->getServerStatus('url'),
-			1
-		);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsNextcloudServer')]
-	public function testIsNextcloudServer(int $statusCode, bool $isValidNextcloudVersion, bool $expected): void {
-		$server = 'server1';
-
-		/** @var TrustedServers&MockObject $trustedServers */
-		$trustedServers = $this->getMockBuilder(TrustedServers::class)
-			->setConstructorArgs(
-				[
-					$this->dbHandler,
-					$this->httpClientService,
-					$this->logger,
-					$this->jobList,
-					$this->secureRandom,
-					$this->config,
-					$this->dispatcher,
-					$this->timeFactory
-				]
-			)
-			->onlyMethods(['checkNextcloudVersion'])
-			->getMock();
-
-		$this->httpClientService->expects($this->once())->method('newClient')
-			->willReturn($this->httpClient);
-
-		$this->httpClient->expects($this->once())->method('get')->with($server . '/status.php')
-			->willReturn($this->response);
-
-		$this->response->expects($this->once())->method('getStatusCode')
-			->willReturn($statusCode);
-
-		if ($statusCode === 200) {
-			$this->response->expects($this->once())->method('getBody')
-				->willReturn('');
-			$trustedServers->expects($this->once())->method('checkNextcloudVersion')
-				->willReturn($isValidNextcloudVersion);
-		} else {
-			$trustedServers->expects($this->never())->method('checkNextcloudVersion');
-		}
-
-		$this->assertSame($expected,
-			$trustedServers->isNextcloudServer($server)
-		);
-	}
-
-	public static function dataTestIsNextcloudServer(): array {
-		return [
-			[200, true, true],
-			[200, false, false],
-			[404, true, false],
-		];
-	}
-
-	public function testIsNextcloudServerFail(): void {
-		$server = 'server1';
-
-		$this->httpClientService->expects($this->once())
-			->method('newClient')
-			->willReturn($this->httpClient);
-
-		$this->httpClient->expects($this->once())
-			->method('get')
-			->with($server . '/status.php')
-			->willThrowException(new \Exception('simulated exception'));
-
-		$this->assertFalse($this->trustedServers->isNextcloudServer($server));
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersion')]
-	public function testCheckNextcloudVersion(string $status): void {
-		$this->assertTrue(self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]));
-	}
-
-	public static function dataTestCheckNextcloudVersion(): array {
-		return [
-			['{"version":"9.0.0"}'],
-			['{"version":"9.1.0"}']
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersionTooLow')]
-	public function testCheckNextcloudVersionTooLow(string $status): void {
-		$this->expectException(HintException::class);
-		$this->expectExceptionMessage('Remote server version is too low. 9.0 is required.');
-
-		self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]);
-	}
-
-	public static function dataTestCheckNextcloudVersionTooLow(): array {
-		return [
-			['{"version":"8.2.3"}'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdateProtocol')]
-	public function testUpdateProtocol(string $url, string $expected): void {
-		$this->assertSame($expected,
-			self::invokePrivate($this->trustedServers, 'updateProtocol', [$url])
-		);
-	}
-
-	public static function dataTestUpdateProtocol(): array {
-		return [
-			['http://owncloud.org', 'http://owncloud.org'],
-			['https://owncloud.org', 'https://owncloud.org'],
-			['owncloud.org', 'https://owncloud.org'],
-			['httpserver', 'https://httpserver'],
-		];
-	}
+    private TrustedServers $trustedServers;
+    private DbHandler&MockObject $dbHandler;
+    private IClientService&MockObject $httpClientService;
+    private IClient&MockObject $httpClient;
+    private IResponse&MockObject $response;
+    private LoggerInterface&MockObject $logger;
+    private IJobList&MockObject $jobList;
+    private ISecureRandom&MockObject $secureRandom;
+    private IConfig&MockObject $config;
+    private IEventDispatcher&MockObject $dispatcher;
+    private ITimeFactory&MockObject $timeFactory;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->dbHandler = $this->createMock(DbHandler::class);
+        $this->dispatcher = $this->createMock(IEventDispatcher::class);
+        $this->httpClientService = $this->createMock(IClientService::class);
+        $this->httpClient = $this->createMock(IClient::class);
+        $this->response = $this->createMock(IResponse::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->jobList = $this->createMock(IJobList::class);
+        $this->secureRandom = $this->createMock(ISecureRandom::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+
+        $this->trustedServers = new TrustedServers(
+            $this->dbHandler,
+            $this->httpClientService,
+            $this->logger,
+            $this->jobList,
+            $this->secureRandom,
+            $this->config,
+            $this->dispatcher,
+            $this->timeFactory
+        );
+    }
+
+    public function testAddServer(): void {
+        /** @var TrustedServers&MockObject $trustedServers */
+        $trustedServers = $this->getMockBuilder(TrustedServers::class)
+            ->setConstructorArgs(
+                [
+                    $this->dbHandler,
+                    $this->httpClientService,
+                    $this->logger,
+                    $this->jobList,
+                    $this->secureRandom,
+                    $this->config,
+                    $this->dispatcher,
+                    $this->timeFactory
+                ]
+            )
+            ->onlyMethods(['updateProtocol'])
+            ->getMock();
+        $trustedServers->expects($this->once())->method('updateProtocol')
+            ->with('url')->willReturn('https://url');
+        $this->timeFactory->method('getTime')
+            ->willReturn(1234567);
+        $this->dbHandler->expects($this->once())->method('addServer')->with('https://url')
+            ->willReturn(1);
+
+        $this->secureRandom->expects($this->once())->method('generate')
+            ->willReturn('token');
+        $this->dbHandler->expects($this->once())->method('addToken')->with('https://url', 'token');
+        $this->jobList->expects($this->once())->method('add')
+            ->with(RequestSharedSecret::class,
+                ['url' => 'https://url', 'token' => 'token', 'created' => 1234567]);
+
+        $this->assertSame(
+            1,
+            $trustedServers->addServer('url')
+        );
+    }
+
+    public function testAddSharedSecret(): void {
+        $this->dbHandler->expects($this->once())->method('addSharedSecret')
+            ->with('url', 'secret');
+        $this->trustedServers->addSharedSecret('url', 'secret');
+    }
+
+    public function testGetSharedSecret(): void {
+        $this->dbHandler->expects($this->once())
+            ->method('getSharedSecret')
+            ->with('url')
+            ->willReturn('secret');
+        $this->assertSame(
+            $this->trustedServers->getSharedSecret('url'),
+            'secret'
+        );
+    }
+
+    public function testRemoveServer(): void {
+        $id = 42;
+        $server = ['url_hash' => 'url_hash'];
+        $this->dbHandler->expects($this->once())->method('removeServer')->with($id);
+        $this->dbHandler->expects($this->once())->method('getServerById')->with($id)
+            ->willReturn($server);
+        $this->dispatcher->expects($this->once())->method('dispatchTyped')
+            ->willReturnCallback(
+                function ($event): void {
+                    $this->assertSame(get_class($event), TrustedServerRemovedEvent::class);
+                    /** @var \OCP\Federated\Events\TrustedServerRemovedEvent $event */
+                    $this->assertSame('url_hash', $event->getUrlHash());
+                }
+            );
+        $this->trustedServers->removeServer($id);
+    }
+
+    public function testGetServers(): void {
+        $this->dbHandler->expects($this->once())->method('getAllServer')->willReturn(['servers']);
+
+        $this->assertEquals(
+            ['servers'],
+            $this->trustedServers->getServers()
+        );
+    }
+
+    public static function dataTestGetServer() {
+        return [
+            [
+                15,
+                [
+                    'id' => 15,
+                    'otherData' => 'first server',
+                ]
+            ],
+            [
+                16,
+                [
+                    'id' => 16,
+                    'otherData' => 'second server',
+                ]
+            ],
+            [
+                42,
+                [
+                    'id' => 42,
+                    'otherData' => 'last server',
+                ]
+            ],
+            [
+                108,
+                null
+            ],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetServer')]
+    public function testGetServer(int $id, ?array $expectedServer): void {
+        $servers = [
+            [
+                'id' => 15,
+                'otherData' => 'first server',
+            ],
+            [
+                'id' => 16,
+                'otherData' => 'second server',
+            ],
+            [
+                'id' => 42,
+                'otherData' => 'last server',
+            ],
+        ];
+        $this->dbHandler->expects($this->once())->method('getAllServer')->willReturn($servers);
+
+        if ($expectedServer === null) {
+            $this->expectException(\Exception::class);
+            $this->expectExceptionMessage('No server found with ID: ' . $id);
+        }
+
+        $this->assertEquals(
+            $expectedServer,
+            $this->trustedServers->getServer($id)
+        );
+    }
+
+    public function testIsTrustedServer(): void {
+        $this->dbHandler->expects($this->once())
+            ->method('serverExists')->with('url')
+            ->willReturn(true);
+
+        $this->assertTrue(
+            $this->trustedServers->isTrustedServer('url')
+        );
+    }
+
+    public function testSetServerStatus(): void {
+        $this->dbHandler->expects($this->once())->method('setServerStatus')
+            ->with('url', 1);
+        $this->trustedServers->setServerStatus('url', 1);
+    }
+
+    public function testGetServerStatus(): void {
+        $this->dbHandler->expects($this->once())->method('getServerStatus')
+            ->with('url')->willReturn(1);
+        $this->assertSame(
+            $this->trustedServers->getServerStatus('url'),
+            1
+        );
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsNextcloudServer')]
+    public function testIsNextcloudServer(int $statusCode, bool $isValidNextcloudVersion, bool $expected): void {
+        $server = 'server1';
+
+        /** @var TrustedServers&MockObject $trustedServers */
+        $trustedServers = $this->getMockBuilder(TrustedServers::class)
+            ->setConstructorArgs(
+                [
+                    $this->dbHandler,
+                    $this->httpClientService,
+                    $this->logger,
+                    $this->jobList,
+                    $this->secureRandom,
+                    $this->config,
+                    $this->dispatcher,
+                    $this->timeFactory
+                ]
+            )
+            ->onlyMethods(['checkNextcloudVersion'])
+            ->getMock();
+
+        $this->httpClientService->expects($this->once())->method('newClient')
+            ->willReturn($this->httpClient);
+
+        $this->httpClient->expects($this->once())->method('get')->with($server . '/status.php')
+            ->willReturn($this->response);
+
+        $this->response->expects($this->once())->method('getStatusCode')
+            ->willReturn($statusCode);
+
+        if ($statusCode === 200) {
+            $this->response->expects($this->once())->method('getBody')
+                ->willReturn('');
+            $trustedServers->expects($this->once())->method('checkNextcloudVersion')
+                ->willReturn($isValidNextcloudVersion);
+        } else {
+            $trustedServers->expects($this->never())->method('checkNextcloudVersion');
+        }
+
+        $this->assertSame($expected,
+            $trustedServers->isNextcloudServer($server)
+        );
+    }
+
+    public static function dataTestIsNextcloudServer(): array {
+        return [
+            [200, true, true],
+            [200, false, false],
+            [404, true, false],
+        ];
+    }
+
+    public function testIsNextcloudServerFail(): void {
+        $server = 'server1';
+
+        $this->httpClientService->expects($this->once())
+            ->method('newClient')
+            ->willReturn($this->httpClient);
+
+        $this->httpClient->expects($this->once())
+            ->method('get')
+            ->with($server . '/status.php')
+            ->willThrowException(new \Exception('simulated exception'));
+
+        $this->assertFalse($this->trustedServers->isNextcloudServer($server));
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersion')]
+    public function testCheckNextcloudVersion(string $status): void {
+        $this->assertTrue(self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]));
+    }
+
+    public static function dataTestCheckNextcloudVersion(): array {
+        return [
+            ['{"version":"9.0.0"}'],
+            ['{"version":"9.1.0"}']
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersionTooLow')]
+    public function testCheckNextcloudVersionTooLow(string $status): void {
+        $this->expectException(HintException::class);
+        $this->expectExceptionMessage('Remote server version is too low. 9.0 is required.');
+
+        self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]);
+    }
+
+    public static function dataTestCheckNextcloudVersionTooLow(): array {
+        return [
+            ['{"version":"8.2.3"}'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdateProtocol')]
+    public function testUpdateProtocol(string $url, string $expected): void {
+        $this->assertSame($expected,
+            self::invokePrivate($this->trustedServers, 'updateProtocol', [$url])
+        );
+    }
+
+    public static function dataTestUpdateProtocol(): array {
+        return [
+            ['http://owncloud.org', 'http://owncloud.org'],
+            ['https://owncloud.org', 'https://owncloud.org'],
+            ['owncloud.org', 'https://owncloud.org'],
+            ['httpserver', 'https://httpserver'],
+        ];
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
 			->willReturn($server);
 		$this->dispatcher->expects($this->once())->method('dispatchTyped')
 			->willReturnCallback(
-				function ($event): void {
+				function($event): void {
 					$this->assertSame(get_class($event), TrustedServerRemovedEvent::class);
 					/** @var \OCP\Federated\Events\TrustedServerRemovedEvent $event */
 					$this->assertSame('url_hash', $event->getUrlHash());
@@ -194,7 +194,7 @@ 
 
 		if ($expectedServer === null) {
 			$this->expectException(\Exception::class);
-			$this->expectExceptionMessage('No server found with ID: ' . $id);
+			$this->expectExceptionMessage('No server found with ID: '.$id);
 		}
 
 		$this->assertEquals(
@@ -252,7 +252,7 @@ 
 		$this->httpClientService->expects($this->once())->method('newClient')
 			->willReturn($this->httpClient);
 
-		$this->httpClient->expects($this->once())->method('get')->with($server . '/status.php')
+		$this->httpClient->expects($this->once())->method('get')->with($server.'/status.php')
 			->willReturn($this->response);
 
 		$this->response->expects($this->once())->method('getStatusCode')
@@ -289,7 +289,7 @@ 
 
 		$this->httpClient->expects($this->once())
 			->method('get')
-			->with($server . '/status.php')
+			->with($server.'/status.php')
 			->willThrowException(new \Exception('simulated exception'));
 
 		$this->assertFalse($this->trustedServers->isNextcloudServer($server));