sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49977 from nextcloud/jtr-perf-checks-connectivity-https-proto 

perf(settings): Speed up InternetConnectivity setup check
pull/50113/head
Josh 2025-01-09 12:09:33 +07:00 committed by GitHub
parent 2f754529ce 35cb5d84ca
commit 1304590d6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/settings/lib/SetupChecks/InternetConnectivity.php
Unescape Escape View File

@ -41,11 +41,12 @@ class InternetConnectivity implements ISetupCheck {
} }
$siteArray = $this->config->getSystemValue('connectivity_check_domains', [ $siteArray = $this->config->getSystemValue('connectivity_check_domains', [
'www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org' 'https://www.nextcloud.com', 'https://www.startpage.com', 'https://www.eff.org', 'https://www.edri.org'
]); ]);
foreach ($siteArray as $site) { foreach ($siteArray as $site) {
if ($this->isSiteReachable($site)) { if ($this->isSiteReachable($site)) {
// successful as soon as one connection succeeds
return SetupResult::success(); return SetupResult::success();
} }
} }
@ -55,19 +56,18 @@ class InternetConnectivity implements ISetupCheck {
/** /**
* Checks if the Nextcloud server can connect to a specific URL * Checks if the Nextcloud server can connect to a specific URL
* @param string $site site domain or full URL with http/https protocol * @param string $site site domain or full URL with http/https protocol
* @return bool success/failure
*/ */
private function isSiteReachable(string $site): bool { private function isSiteReachable(string $site): bool {
// if there is no protocol specified, test http:// first then, if necessary, https://
if (preg_match('/^https?:\/\//', $site) !== 1) {
$httpSite = 'http://' . $site . '/';
$httpsSite = 'https://' . $site . '/';
return $this->isSiteReachable($httpSite) || $this->isSiteReachable($httpsSite);
}
try { try {
$client = $this->clientService->newClient(); $client = $this->clientService->newClient();
// if there is no protocol, test http:// AND https:// $client->get($site);
if (preg_match('/^https?:\/\//', $site) !== 1) {
$httpSite = 'http://' . $site . '/';
$client->get($httpSite);
$httpsSite = 'https://' . $site . '/';
$client->get($httpsSite);
} else {
$client->get($site);
}
} catch (\Exception $e) { } catch (\Exception $e) {
$this->logger->error('Cannot connect to: ' . $site, [ $this->logger->error('Cannot connect to: ' . $site, [
'app' => 'internet_connection_check', 'app' => 'internet_connection_check',

16
config/config.sample.php
Unescape Escape View File

@ -936,16 +936,16 @@ $CONFIG = [
* *
* Defaults to the following domains: * Defaults to the following domains:
* *
* - www.nextcloud.com * - https://www.nextcloud.com
* - www.startpage.com * - https://www.startpage.com
* - www.eff.org * - https://www.eff.org
* - www.edri.org * - https://www.edri.org
*/ */
'connectivity_check_domains' => [ 'connectivity_check_domains' => [
'www.nextcloud.com', 'https://www.nextcloud.com',
'www.startpage.com', 'https://www.startpage.com',
'www.eff.org', 'https://www.eff.org',
'www.edri.org' 'https://www.edri.org'
], ],
/** /**