Merge pull request #45284 from nextcloud/backport/45262/stable29

[stable29] fix(SetupChecks): Detect CLI mode in HTTPS / URL generator check
This commit is contained in:
Josh 2024-05-14 07:47:25 -04:00 committed by GitHub
commit cb63ff82c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -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.'));
}
}