From 7dbafce16f4aa334c89277da17f59bed6d151ec3 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sat, 8 Mar 2025 20:54:15 +0100 Subject: [PATCH] fix(lookup-server): do not upload data by default Signed-off-by: Ferdinand Thiessen --- apps/federatedfilesharing/lib/FederatedShareProvider.php | 4 ++-- .../federatedfilesharing/tests/FederatedShareProviderTest.php | 2 +- apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php | 2 +- apps/lookup_server_connector/lib/UpdateLookupServer.php | 2 +- apps/settings/lib/BackgroundJobs/VerifyUserData.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 75bc6261756..63ba3df2634 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -1085,8 +1085,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 797d029d6b1..e24cfca36a4 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -877,7 +877,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 39d8118abe7..e8b9ebf6dba 100644 --- a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php +++ b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php @@ -117,7 +117,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 ec528e6effa..7d2af20ace2 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 ec75f4243be..6f128ce7ae3 100644 --- a/apps/settings/lib/BackgroundJobs/VerifyUserData.php +++ b/apps/settings/lib/BackgroundJobs/VerifyUserData.php @@ -170,7 +170,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; }