aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJosh Richards <josh.t.richards@gmail.com>2024-05-10 17:02:28 -0400
committerJosh Richards <josh.t.richards@gmail.com>2024-05-12 18:09:36 -0400
commit5b5178abe74a4c8be508b87c7c81ac445d4e5d65 (patch)
tree27467c86480534b6c2af5fab7a51cf11cb8afa26 /apps
parent0d52697f8fa8511a5a7ecec7d68485cf3498b079 (diff)
downloadnextcloud-server-5b5178abe74a4c8be508b87c7c81ac445d4e5d65.tar.gz
nextcloud-server-5b5178abe74a4c8be508b87c7c81ac445d4e5d65.zip
fix(SetupChecks): Detect CLI mode in HTTPS / URL generator check
Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/settings/lib/SetupChecks/HttpsUrlGeneration.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/apps/settings/lib/SetupChecks/HttpsUrlGeneration.php b/apps/settings/lib/SetupChecks/HttpsUrlGeneration.php
index 59f99c801cb..664ad5ec1db 100644
--- a/apps/settings/lib/SetupChecks/HttpsUrlGeneration.php
+++ b/apps/settings/lib/SetupChecks/HttpsUrlGeneration.php
@@ -64,12 +64,19 @@ class HttpsUrlGeneration implements ISetupCheck {
}
$generatedUrl = $this->urlGenerator->getAbsoluteURL('index.php');
if (!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) {
+ 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.'));
}
}