From fe79a1ad3e23ece390f4f6b1f7655344f241a495 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 2 Dec 2020 13:16:33 +0100
Subject: [PATCH] Harden setup check for TLS version if host is not reachable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
apps/settings/lib/Controller/CheckSetupController.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index 6984b0f5aea..7929e9c3962 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -262,6 +262,9 @@ class CheckSetupController extends Controller {
if ($e->getResponse()->getStatusCode() === 400) {
return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['NSS', $versionString, $features]);
}
+ } catch (\Exception $e) {
+ $this->logger->logException($e, ['app' => 'settings', 'level' => \OCP\ILogger::WARN]);
+ return $this->l10n->t('Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details.');
}
}
--
GitLab