upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #56844 from nextcloud/backport/56501/stable31

Browse source
This commit is contained in:
Benjamin Gaussorgues 2025-12-04 18:39:31 +01:00 committed by GitHub
commit c937eed3f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@
*/
namespace OC\Collaboration\Collaborators;
use OCA\Federation\TrustedServers;
use OCP\Collaboration\Collaborators\ISearchPlugin;
use OCP\Collaboration\Collaborators\ISearchResult;
use OCP\Collaboration\Collaborators\SearchResultType;
@ -25,6 +26,7 @@ class LookupPlugin implements ISearchPlugin {
IUserSession $userSession,
private ICloudIdManager $cloudIdManager,
private LoggerInterface $logger,
private ?TrustedServers $trustedServers,
) {
$currentUserCloudId = $userSession->getUser()->getCloudId();
$this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
@ -81,6 +83,8 @@ class LookupPlugin implements ISearchPlugin {
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => $isGlobalScaleEnabled,
'shareWith' => $lookup['federationId'],
'server' => $remote,
'isTrustedServer' => $this->trustedServers?->isTrustedServer($remote) ?? false,
],
'extra' => $lookup,
];

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

@ -56,6 +56,10 @@ class LookupPluginTest extends TestCase {
if ($cloudId === 'user@myNextcloud.net') {
return new CloudId('user@myNextcloud.net', 'user', 'myNextcloud.net');
}
if (str_contains($cloudId, '@enceladus.moon')) {
[$user, $remote] = explode('@', $cloudId, 2);
return new CloudId($cloudId, $user, $remote);
}
return new CloudId('user@someNextcloud.net', 'user', 'someNextcloud.net');
});
@ -65,7 +69,8 @@ class LookupPluginTest extends TestCase {
$this->clientService,
$this->userSession,
$this->cloudIdManager,
$this->logger
$this->logger,
null
);
}
@ -300,7 +305,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[0]
'shareWith' => $fedIDs[0],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[0]],
],
@ -309,7 +316,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[1]
'shareWith' => $fedIDs[1],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[1]],
],
@ -318,7 +327,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[2]
'shareWith' => $fedIDs[2],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[2]],
],
@ -342,7 +353,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[0]
'shareWith' => $fedIDs[0],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[0]],
],
@ -351,7 +364,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[1]
'shareWith' => $fedIDs[1],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[1]],
],
@ -360,7 +375,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[2]
'shareWith' => $fedIDs[2],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[2]],
],
@ -474,7 +491,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[0]
'shareWith' => $fedIDs[0],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[0]],
],
@ -483,7 +502,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[1]
'shareWith' => $fedIDs[1],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[1]],
],
@ -492,7 +513,9 @@ class LookupPluginTest extends TestCase {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[2]
'shareWith' => $fedIDs[2],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[2]],
],