Merge pull request #11657 from nextcloud/bugfix/noid/improve-logging

fix(federation): Improve logging
nextcloud · Feb 27, 2024 · fca0fae · fca0fae
2 parents 201e123 + 028e3c8
commit fca0fae
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/lib/Federation/Proxy/TalkV1/Controller/AvatarController.php b/lib/Federation/Proxy/TalkV1/Controller/AvatarController.php
@@ -61,7 +61,7 @@ public function getAvatar(Room $room, Participant $participant, bool $darkTheme)
 		);
 
 		if ($proxy->getStatusCode() !== Http::STATUS_OK) {
-			$this->proxy->logUnexpectedStatusCode(__METHOD__, $proxy->getStatusCode());
+			$this->proxy->logUnexpectedStatusCode(__METHOD__, $proxy->getStatusCode(), (string) $proxy->getBody());
 			throw new CannotReachRemoteException('Avatar request had unexpected status code');
 		}
 

diff --git a/lib/Federation/Proxy/TalkV1/Controller/ChatController.php b/lib/Federation/Proxy/TalkV1/Controller/ChatController.php
@@ -130,7 +130,7 @@ public function receiveMessages(
 		// FIXME
 		// Poor-mans timeout, should later on cancel/trigger earlier,
 		// when we received a OCM message notifying us about a chat message
-		sleep($timeout);
+		sleep(max(0, $timeout - 5));
 
 		$proxy = $this->proxy->get(
 			$participant->getAttendee()->getInvitedCloudId(),

diff --git a/lib/Federation/Proxy/TalkV1/ProxyRequest.php b/lib/Federation/Proxy/TalkV1/ProxyRequest.php
@@ -49,11 +49,11 @@ public function __construct(
 	/**
 	 * @return Http::STATUS_BAD_REQUEST
 	 */
-	public function logUnexpectedStatusCode(string $method, int $statusCode): int {
+	public function logUnexpectedStatusCode(string $method, int $statusCode, string $logDetails = ''): int {
 		if ($this->config->getSystemValueBool('debug')) {
-			$this->logger->error('Unexpected status code ' . $statusCode . ' returned for ' . $method);
+			$this->logger->error('Unexpected status code ' . $statusCode . ' returned for ' . $method . ($logDetails !== '' ? "\n" . $logDetails : ''));
 		} else {
-			$this->logger->debug('Unexpected status code ' . $statusCode . ' returned for ' . $method);
+			$this->logger->debug('Unexpected status code ' . $statusCode . ' returned for ' . $method . ($logDetails !== '' ? "\n" . $logDetails : ''));
 		}
 		return Http::STATUS_BAD_REQUEST;
 	}
@@ -78,6 +78,13 @@ protected function generateDefaultRequestOptions(
 		];
 	}
 
+	protected function prependProtocolIfNotAvailable(string $url): string {
+		if (!str_starts_with($url, 'http://') && !str_starts_with($url, 'https://')) {
+			$url = 'https://' . $url;
+		}
+		return $url;
+	}
+
 	/**
 	 * @param 'get'|'post'|'put'|'delete' $verb
 	 * @throws CannotReachRemoteException
@@ -96,7 +103,10 @@ protected function request(
 		}
 
 		try {
-			return $this->clientService->newClient()->{$verb}($url, $requestOptions);
+			return $this->clientService->newClient()->{$verb}(
+				$this->prependProtocolIfNotAvailable($url),
+				$requestOptions
+			);
 		} catch (ClientException $e) {
 			$status = $e->getResponse()->getStatusCode();
 
@@ -212,7 +222,7 @@ public function getOCSData(IResponse $response, array $allowedStatusCodes = [Htt
 				throw new \RuntimeException('JSON response is not an array');
 			}
 		} catch (\Throwable $e) {
-			$this->logger->error('Error parsing JSON response', ['exception' => $e]);
+			$this->logger->error('Error parsing JSON response: ' . ($content ?? 'no-data'), ['exception' => $e]);
 			throw new CannotReachRemoteException('Error parsing JSON response', $e->getCode(), $e);
 		}