fix(lookup-server): do not upload data by default

Signed-off-by: Ferdinand Thiessen <[email protected]>
nextcloud · Mar 10, 2025 · 778cf5e · 778cf5e
1 parent eb59791
commit 778cf5e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -1011,7 +1011,7 @@ public function isLookupServerUploadEnabled(): bool {
 		if ($this->gsConfig->isGlobalScaleEnabled()) {
 			return false;
 		}
-		$result = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', '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
@@ -853,7 +853,7 @@ public function testIsLookupServerUploadEnabled($gsEnabled, $isEnabled, $expecte
 		$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
@@ -86,7 +86,7 @@ public function start(IJobList $jobList): void {
 	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
@@ -57,7 +57,7 @@ public function userUpdated(IUser $user): void {
 	 */
 	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
@@ -121,7 +121,7 @@ protected function verifyWebsite(array $argument) {
 
 	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;
 		}