Merge pull request #365 from unglaublicherdude/fix-behaviour-when-ica…

…p-client-cannot-connect-to-socket

Get proper errer message when the connection to an ICAP Server fails

lib/ICAP/ICAPClient.php

@@ -51,15 +51,15 @@ protected function connect() {
 			$errorMessage,
 			$this->connectTimeout
 		);
-
-		socket_set_timeout($stream, 600);
-
+
 		if (!$stream) {
 			throw new RuntimeException(
 				"Cannot connect to \"tcp://{$this->host}:{$this->port}\": $errorMessage (code $errorCode)"
 			);
 		}
 
+		socket_set_timeout($stream, 600);
+
 		return $stream;
 	}
 

tests/ICAP/ICAPClientTest.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Files_Antivirus\Tests\ICAP;
+
+use OCA\Files_Antivirus\ICAP\ICAPClient;
+use Test\TestCase;
+
+class ICAPClientTest extends TestCase {
+	public function testConnect_ShouldThrowRuntimeException() {
+		$this->expectException(\RuntimeException::class);
+		$this->expectExceptionMessageMatches('/Cannot connect to "tcp\:\/\/nothinghere\:8080"\: .*/');
+		$icapClient = new ICAPClient("nothinghere", 8080, 2);
+		$icapClient->respmod("myservice", [], [], []);
+	}
+}

tests/StatusTest.php

@@ -8,7 +8,7 @@
 
 namespace OCA\Files_Antivirus\Tests;
 
-use \OCA\Files_Antivirus\Db\RuleMapper;
+use OCA\Files_Antivirus\Db\RuleMapper;
 use Psr\Log\LoggerInterface;
 
 /**

tests/stub.phpstub

@@ -289,6 +289,10 @@ namespace OC\Files\Storage\Wrapper{
 		public function getWatcher() {
 			throw new \Exception('stub');
 		}
+
+		public function setOwner(?string $user): void {
+			throw new \Exception('stub');
+		}
 	}
 
 	class Jail extends Wrapper {