diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-03-08 20:54:15 +0100 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-03-11 21:56:25 +0100 |
| commit | 4ec1edb890ce02d5f13cbf0ca1a0c7766ec4ac7d (patch) | |
| tree | 13e5e68dab9e7ff659782c2091fdb8487ee2a766 | |
| parent | afeda70a8db4150a8c6f213daa83d6c4c3e8bbac (diff) | |
| download | nextcloud-server-4ec1edb890ce02d5f13cbf0ca1a0c7766ec4ac7d.tar.gz nextcloud-server-4ec1edb890ce02d5f13cbf0ca1a0c7766ec4ac7d.zip | |
fix(lookup-server): do not upload data by default
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
5 files changed, 6 insertions, 6 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 31d0a84136c..9ca36b65c4f 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -1054,8 +1054,8 @@ class FederatedShareProvider implements IShareProvider { if ($this->gsConfig->isGlobalScaleEnabled()) { return false; } - $result = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes'); - return ($result === 'yes'); + $result = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no'); + return $result === 'yes'; } /** diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index 40b8b944507..41b79a88011 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -876,7 +876,7 @@ class FederatedShareProviderTest extends \Test\TestCase { $this->gsConfig->expects($this->once())->method('isGlobalScaleEnabled') ->willReturn($gsEnabled); $this->config->expects($this->any())->method('getAppValue') - ->with('files_sharing', 'lookupServerUploadEnabled', 'yes') + ->with('files_sharing', 'lookupServerUploadEnabled', 'no') ->willReturn($isEnabled); $this->assertSame($expected, diff --git a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php index 52464ec7dea..9d733d46c4d 100644 --- a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php +++ b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php @@ -116,7 +116,7 @@ class RetryJob extends Job { protected function shouldRemoveBackgroundJob(): bool { return $this->config->getSystemValueBool('has_internet_connection', true) === false || $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') === '' || - $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' || + $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no') !== 'yes' || $this->retries >= 5; } diff --git a/apps/lookup_server_connector/lib/UpdateLookupServer.php b/apps/lookup_server_connector/lib/UpdateLookupServer.php index 7d1b6a1cb63..c9b819db58b 100644 --- a/apps/lookup_server_connector/lib/UpdateLookupServer.php +++ b/apps/lookup_server_connector/lib/UpdateLookupServer.php @@ -83,7 +83,7 @@ class UpdateLookupServer { */ private function shouldUpdateLookupServer(): bool { return $this->config->getSystemValueBool('has_internet_connection', true) === true && - $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') === 'yes' && + $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no') === 'yes' && $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== ''; } } diff --git a/apps/settings/lib/BackgroundJobs/VerifyUserData.php b/apps/settings/lib/BackgroundJobs/VerifyUserData.php index 122229fc8ab..5e86cb5bfc6 100644 --- a/apps/settings/lib/BackgroundJobs/VerifyUserData.php +++ b/apps/settings/lib/BackgroundJobs/VerifyUserData.php @@ -146,7 +146,7 @@ class VerifyUserData extends Job { protected function verifyViaLookupServer(array $argument, string $dataType): bool { if (empty($this->lookupServerUrl) || - $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' || + $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no') !== 'yes' || $this->config->getSystemValue('has_internet_connection', true) === false) { return true; } |