From 20afe94297ca534b9a59cd73dc90d5cb6546ac02 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 25 Jun 2019 13:37:31 +0200 Subject: [PATCH] Do not show a internet connectivity warning if internet access is disabled Signed-off-by: Christoph Wurst --- core/js/setupchecks.js | 2 +- core/js/tests/specs/setupchecksSpec.js | 34 +++++++++---------- settings/Controller/CheckSetupController.php | 8 ++--- .../Controller/CheckSetupControllerTest.php | 12 +++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 487d833db0..0e8aeca845 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -239,7 +239,7 @@ type: OC.SetupChecks.MESSAGE_TYPE_ERROR }); } - if (!data.serverHasInternetConnection) { + if (data.serverHasInternetConnectionProblems) { messages.push({ msg: t('core', 'This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. Establish a connection from this server to the Internet to enjoy all features.'), type: OC.SetupChecks.MESSAGE_TYPE_WARNING diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index b5248add98..a2a92874fa 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -230,7 +230,7 @@ describe('OC.SetupChecks tests', function() { hasValidTransactionIsolationLevel: true, suggestedOverwriteCliURL: '', isRandomnessSecure: true, - serverHasInternetConnection: false, + serverHasInternetConnectionProblems: true, memcacheDocs: 'https://docs.nextcloud.com/server/go.php?to=admin-performance', forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -282,7 +282,7 @@ describe('OC.SetupChecks tests', function() { hasValidTransactionIsolationLevel: true, suggestedOverwriteCliURL: '', isRandomnessSecure: true, - serverHasInternetConnection: false, + serverHasInternetConnectionProblems: true, memcacheDocs: 'https://docs.nextcloud.com/server/go.php?to=admin-performance', forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -335,7 +335,7 @@ describe('OC.SetupChecks tests', function() { hasValidTransactionIsolationLevel: true, suggestedOverwriteCliURL: '', isRandomnessSecure: true, - serverHasInternetConnection: false, + serverHasInternetConnectionProblems: true, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -386,7 +386,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: false, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -435,7 +435,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: false, @@ -484,7 +484,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -534,7 +534,7 @@ describe('OC.SetupChecks tests', function() { hasValidTransactionIsolationLevel: true, suggestedOverwriteCliURL: '', isRandomnessSecure: true, - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: false, reverseProxyDocs: 'https://docs.owncloud.org/foo/bar.html', @@ -583,7 +583,7 @@ describe('OC.SetupChecks tests', function() { hasValidTransactionIsolationLevel: true, suggestedOverwriteCliURL: '', isRandomnessSecure: true, - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, reverseProxyDocs: 'https://docs.owncloud.org/foo/bar.html', @@ -632,7 +632,7 @@ describe('OC.SetupChecks tests', function() { hasValidTransactionIsolationLevel: true, suggestedOverwriteCliURL: '', isRandomnessSecure: true, - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, reverseProxyDocs: 'https://docs.owncloud.org/foo/bar.html', @@ -673,7 +673,7 @@ describe('OC.SetupChecks tests', function() { { 'Content-Type': 'application/json' }, - JSON.stringify({data: {serverHasInternetConnection: false}}) + JSON.stringify({data: {serverHasInternetConnectionProblems: true}}) ); async.done(function( data, s, x ){ @@ -702,7 +702,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, phpSupported: {eol: true, version: '5.4.0'}, @@ -752,7 +752,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -802,7 +802,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -852,7 +852,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -902,7 +902,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -951,7 +951,7 @@ describe('OC.SetupChecks tests', function() { suggestedOverwriteCliURL: '', isRandomnessSecure: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', - serverHasInternetConnection: true, + serverHasInternetConnectionProblems: false, isMemcacheConfigured: true, forwardedForHeadersWorking: true, isCorrectMemcachedPHPModuleInstalled: true, @@ -1418,7 +1418,7 @@ describe('OC.SetupChecks tests', function() { { 'Content-Type': 'application/json' }, - JSON.stringify({data: {serverHasInternetConnection: false}}) + JSON.stringify({data: {serverHasInternetConnectionProblems: true}}) ); async.done(function( data, s, x ){ expect(data).toEqual([{ diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index f760eefacb..a8102b2e13 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -123,7 +123,7 @@ class CheckSetupController extends Controller { * Checks if the server can connect to the internet using HTTPS and HTTP * @return bool */ - private function isInternetConnectionWorking() { + private function hasInternetConnectivityProblems(): bool { if ($this->config->getSystemValue('has_internet_connection', true) === false) { return false; } @@ -134,10 +134,10 @@ class CheckSetupController extends Controller { foreach($siteArray as $site) { if ($this->isSiteReachable($site)) { - return true; + return false; } } - return false; + return true; } /** @@ -670,7 +670,7 @@ Raw output 'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(), 'cronInfo' => $this->getLastCronInfo(), 'cronErrors' => $this->getCronErrors(), - 'serverHasInternetConnection' => $this->isInternetConnectionWorking(), + 'serverHasInternetConnectionProblems' => $this->hasInternetConnectivityProblems(), 'isMemcacheConfigured' => $this->isMemcacheConfigured(), 'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'), 'isRandomnessSecure' => $this->isRandomnessSecure(), diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php index deca75b4b2..9463e4b2a4 100644 --- a/tests/Settings/Controller/CheckSetupControllerTest.php +++ b/tests/Settings/Controller/CheckSetupControllerTest.php @@ -180,7 +180,7 @@ class CheckSetupControllerTest extends TestCase { $this->assertFalse( self::invokePrivate( $this->checkSetupController, - 'isInternetConnectionWorking' + 'hasInternetConnectivityProblems' ) ); } @@ -206,10 +206,10 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue($client)); - $this->assertTrue( + $this->assertFalse( self::invokePrivate( $this->checkSetupController, - 'isInternetConnectionWorking' + 'hasInternetConnectivityProblems' ) ); } @@ -235,10 +235,10 @@ class CheckSetupControllerTest extends TestCase { ->method('newClient') ->will($this->returnValue($client)); - $this->assertFalse( + $this->assertTrue( self::invokePrivate( $this->checkSetupController, - 'isInternetConnectionWorking' + 'hasInternetConnectivityProblems' ) ); } @@ -540,7 +540,7 @@ class CheckSetupControllerTest extends TestCase { 'backgroundJobsUrl' => 'https://example.org', ], 'cronErrors' => [], - 'serverHasInternetConnection' => false, + 'serverHasInternetConnectionProblems' => true, 'isMemcacheConfigured' => true, 'memcacheDocs' => 'http://docs.example.org/server/go.php?to=admin-performance', 'isRandomnessSecure' => self::invokePrivate($this->checkSetupController, 'isRandomnessSecure'),