From 17364466e16103d638153ff5ffc46b536037ad68 Mon Sep 17 00:00:00 2001 From: Josh Richards Date: Sun, 12 May 2024 11:04:43 -0400 Subject: [PATCH] fix: adjust CLI mode check + messaging changes + add missing docs link Signed-off-by: Josh Richards --- .../lib/SetupChecks/HttpsUrlGeneration.php | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/apps/settings/lib/SetupChecks/HttpsUrlGeneration.php b/apps/settings/lib/SetupChecks/HttpsUrlGeneration.php index 9c81cecb56e8b..98bd8a1e5ac55 100644 --- a/apps/settings/lib/SetupChecks/HttpsUrlGeneration.php +++ b/apps/settings/lib/SetupChecks/HttpsUrlGeneration.php @@ -63,17 +63,20 @@ public function run(): SetupResult { } } $generatedUrl = $this->urlGenerator->getAbsoluteURL('index.php'); - if (!\OC::$CLI && !str_starts_with($generatedUrl, 'https://')) { - return SetupResult::warning( - $this->l10n->t('You are accessing your instance over a secure connection, however your instance is generating insecure URLs. This most likely means that you are behind a reverse proxy and the overwrite config variables are not set correctly.'), - $this->urlGenerator->linkToDocs('admin-reverse-proxy') - ); - } - if (\OC::$CLI) { - /* We were called from CLI so we can't check this */ - return SetupResult::info($this->l10n->t('Your URL generation could not be checked from CLI mode.')); - } else { - return SetupResult::success($this->l10n->t('You are accessing your instance over a secure connection, and your instance is generating secure URLs.')); + if (!str_starts_with($generatedUrl, 'https://')) { + if (!\OC::$CLI) { + return SetupResult::warning( + $this->l10n->t('You are accessing your instance over a secure connection, however your instance is generating insecure URLs. This likely means that your instance is behind a reverse proxy and the Nextcloud `overwrite*` config values are not set correctly.'), + $this->urlGenerator->linkToDocs('admin-reverse-proxy') + ); + /* We were called from CLI so we can't be 100% sure which scenario is applicable */ + } else { + return SetupResult::info( + $this->l10n->t('Your instance is generating insecure URLs. If you access your instance over HTTPS, this likely means that your instance is behind a reverse proxy and the Nextcloud `overwrite*` config values are not set correctly.'), + $this->urlGenerator->linkToDocs('admin-reverse-proxy') + ); + } } + return SetupResult::success($this->l10n->t('You are accessing your instance over a secure connection, and your instance is generating secure URLs.')); } }