mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12571 from TheLastProject/feature/make_connectivity_check_domains_changeable 

Make connectivity check domains configurable
This commit is contained in:
Morris Jobke 2018-11-22 13:42:54 +01:00 committed by GitHub
parent e8df902083 935bb25639
commit db6fad3eee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/config.sample.php
View File

@ -656,6 +656,26 @@ $CONFIG = array(
*/
'has_internet_connection' => true,
/**
* Which domains to request to determine the availability of an Internet
* connection. If none of these hosts are reachable, the administration panel
* will show a warning. Set to an empty list to not do any such checks (warning
* will still be shown).
*
* Defaults to the following domains:
*
* - www.nextcloud.com
* - www.startpage.com
* - www.eff.org
* - www.edri.org
*/
'connectivity_check_domains' => array(
'www.nextcloud.com',
'www.startpage.com',
'www.eff.org',
'www.edri.org'
),
/**
* Allows Nextcloud to verify a working .well-known URL redirects. This is done
* by attempting to make a request from JS to

8
settings/Controller/CheckSetupController.php
View File

@ -130,11 +130,9 @@ class CheckSetupController extends Controller {
return false;
}
$siteArray = ['www.nextcloud.com',
'www.startpage.com',
'www.eff.org',
'www.edri.org',
];
$siteArray = $this->config->getSystemValue('connectivity_check_domains', [
'www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org'
]);
foreach($siteArray as $site) {
if ($this->isSiteReachable($site)) {

26
tests/Settings/Controller/CheckSetupControllerTest.php
View File

@ -189,10 +189,15 @@ class CheckSetupControllerTest extends TestCase {
}
public function testIsInternetConnectionWorkingCorrectly() {
$this->config->expects($this->once())
$this->config->expects($this->at(0))
->method('getSystemValue')
->with('has_internet_connection', true)
->will($this->returnValue(true));
->will($this->returnValue(true));
$this->config->expects($this->at(1))
->method('getSystemValue')
->with('connectivity_check_domains', ['www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org'])
->will($this->returnValue(['www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org']));
$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
->disableOriginalConstructor()->getMock();
@ -213,10 +218,15 @@ class CheckSetupControllerTest extends TestCase {
}
public function testIsInternetConnectionFail() {
$this->config->expects($this->once())
$this->config->expects($this->at(0))
->method('getSystemValue')
->with('has_internet_connection', true)
->will($this->returnValue(true));
->will($this->returnValue(true));
$this->config->expects($this->at(1))
->method('getSystemValue')
->with('connectivity_check_domains', ['www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org'])
->will($this->returnValue(['www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org']));
$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
->disableOriginalConstructor()->getMock();
@ -338,14 +348,18 @@ class CheckSetupControllerTest extends TestCase {
->with('core', 'cronErrors')
->willReturn('');
$this->config->expects($this->at(2))
->method('getSystemValue')
->with('connectivity_check_domains', ['www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org'])
->will($this->returnValue(['www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org']));
$this->config->expects($this->at(3))
->method('getSystemValue')
->with('memcache.local', null)
->will($this->returnValue('SomeProvider'));
$this->config->expects($this->at(3))
$this->config->expects($this->at(4))
->method('getSystemValue')
->with('has_internet_connection', true)
->will($this->returnValue(true));
$this->config->expects($this->at(4))
$this->config->expects($this->at(5))
->method('getSystemValue')
->with('appstoreenabled', true)
->will($this->returnValue(false));