upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

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

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2025-03-10 15:31:45 +01:00
parent 5e4910e10e
commit 34251c4375
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
6 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/federatedfilesharing/lib/FederatedShareProvider.php
View file

@ -998,8 +998,7 @@ class FederatedShareProvider implements IShareProvider {
if ($this->gsConfig->isGlobalScaleEnabled()) {
return true;
}
$result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes');
return $result === 'yes';
$result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
}

2
apps/federatedfilesharing/tests/FederatedShareProviderTest.php
View file

@ -825,7 +825,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', 'lookupServerEnabled', 'yes')
->with('files_sharing', 'lookupServerEnabled', 'no')
->willReturn($isEnabled);
$this->assertSame($expected,

9
apps/files_sharing/lib/Controller/ShareesAPIController.php
View file

@ -176,12 +176,9 @@ class ShareesAPIController extends OCSController {
$this->offset = $perPage * ($page - 1);
// In global scale mode we always search the loogup server
if ($this->config->getSystemValueBool('gs.enabled', false)) {
$lookup = true;
$this->result['lookupEnabled'] = true;
} else {
$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
}
$lookup = $this->config->getSystemValueBool('gs.enabled', false)
|| $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
$this->result['lookupEnabled'] = $lookup;
[$result, $hasMoreResults] = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);

2
apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
View file

@ -235,7 +235,7 @@ class ShareesAPIControllerTest extends TestCase {
->method('getAppValue')
->with($this->anything(), $this->anything(), $this->anything())
->willReturnMap([
['files_sharing', 'lookupServerEnabled', 'yes', 'yes'],
['files_sharing', 'lookupServerEnabled', 'no', 'yes'],
]);
$this->shareManager->expects($this->once())

2
lib/private/Collaboration/Collaborators/LookupPlugin.php
View file

@ -32,7 +32,7 @@ class LookupPlugin implements ISearchPlugin {
public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
$isGlobalScaleEnabled = $this->config->getSystemValueBool('gs.enabled', false);
$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
$hasInternetConnection = $this->config->getSystemValueBool('has_internet_connection', true);
// if case of Global Scale we always search the lookup server

8
tests/lib/Collaboration/Collaborators/LookupPluginTest.php
View file

@ -72,7 +72,7 @@ class LookupPluginTest extends TestCase {
public function testSearchNoLookupServerURI(): void {
$this->config->expects($this->once())
->method('getAppValue')
->with('files_sharing', 'lookupServerEnabled', 'yes')
->with('files_sharing', 'lookupServerEnabled', 'no')
->willReturn('yes');
$this->config->expects($this->exactly(2))
->method('getSystemValueBool')
@ -101,7 +101,7 @@ class LookupPluginTest extends TestCase {
public function testSearchNoInternet(): void {
$this->config->expects($this->once())
->method('getAppValue')
->with('files_sharing', 'lookupServerEnabled', 'yes')
->with('files_sharing', 'lookupServerEnabled', 'no')
->willReturn('yes');
$this->config->expects($this->exactly(2))
->method('getSystemValueBool')
@ -137,7 +137,7 @@ class LookupPluginTest extends TestCase {
$this->config->expects($this->once())
->method('getAppValue')
->with('files_sharing', 'lookupServerEnabled', 'yes')
->with('files_sharing', 'lookupServerEnabled', 'no')
->willReturn('yes');
$this->config->expects($this->exactly(2))
->method('getSystemValueBool')
@ -197,7 +197,7 @@ class LookupPluginTest extends TestCase {
$this->config->expects($this->once())
->method('getAppValue')
->with('files_sharing', 'lookupServerEnabled', 'yes')
->with('files_sharing', 'lookupServerEnabled', 'no')
->willReturn($LookupEnabled ? 'yes' : 'no');
if ($GSEnabled || $LookupEnabled) {
$searchResult->expects($this->once())