Merge pull request nextcloud#767 from nextcloud/federation-error-mess…

…ages improve federation error messages
GitHubUser4234 · Aug 9, 2016 · 4e2b1ef · 4e2b1ef
2 parents 253152e + 9aa9465
commit 4e2b1ef
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php
@@ -113,8 +113,8 @@ protected function checkServer($url) {
 		}
 
 		if ($this->trustedServers->isOwnCloudServer($url) === false) {
-			$message = 'No server to federate found';
-			$hint = $this->l->t('No server to federate found');
+			$message = 'No server to federate with found';
+			$hint = $this->l->t('No server to federate with found');
 			throw new HintException($message, $hint);
 		}
 

diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php
@@ -89,7 +89,7 @@ public function addServer($url) {
 		if ($result) {
 			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
 		} else {
-			$message = 'Internal failure, Could not add ownCloud as 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);
 		}

diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php
@@ -211,23 +211,29 @@ public function getServerStatus($url) {
 	}
 
 	/**
-	 * check if URL point to a ownCloud server
+	 * check if URL point to a ownCloud/Nextcloud server
 	 *
 	 * @param string $url
 	 * @return bool
 	 */
 	public function isOwnCloudServer($url) {
 		$isValidOwnCloud = false;
 		$client = $this->httpClientService->newClient();
-		$result = $client->get(
-			$url . '/status.php',
-			[
-				'timeout' => 3,
-				'connect_timeout' => 3,
-			]
-		);
-		if ($result->getStatusCode() === Http::STATUS_OK) {
-			$isValidOwnCloud = $this->checkOwnCloudVersion($result->getBody());
+		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;

diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
@@ -309,7 +309,6 @@ public function dataTestIsOwnCloudServer() {
 	}
 
 	/**
-	 * @expectedException \Exception
 	 * @expectedExceptionMessage simulated exception
 	 */
 	public function testIsOwnCloudServerFail() {
@@ -323,7 +322,7 @@ public function testIsOwnCloudServerFail() {
 				throw new \Exception('simulated exception');
 			});
 
-		$this->trustedServers->isOwnCloudServer($server);
+		$this->assertFalse($this->trustedServers->isOwnCloudServer($server));
 	}
 
 	/**