Skip to content

[stable31] fix(sharing): Add isTrustedServer flag to lookup results #56844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Altahrim merged 1 commit into from
Dec 4, 2025
Merged

[stable31] fix(sharing): Add isTrustedServer flag to lookup results #56844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/private/Collaboration/Collaborators/LookupPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -25,6 +26,7 @@ public function __construct(
IUserSession $userSession,
private ICloudIdManager $cloudIdManager,
private LoggerInterface $logger,
private ?TrustedServers $trustedServers,
) {
$currentUserCloudId = $userSession->getUser()->getCloudId();
$this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
Expand Down Expand Up @@ -81,6 +83,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult): b
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => $isGlobalScaleEnabled,
'shareWith' => $lookup['federationId'],
'server' => $remote,
'isTrustedServer' => $this->trustedServers?->isTrustedServer($remote) ?? false,
],
'extra' => $lookup,
];
Expand Down
43 changes: 33 additions & 10 deletions tests/lib/Collaboration/Collaborators/LookupPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ protected function setUp(): void {
if ($cloudId === '[email protected]') {
return new CloudId('[email protected]', 'user', 'myNextcloud.net');
}
if (str_contains($cloudId, '@enceladus.moon')) {
[$user, $remote] = explode('@', $cloudId, 2);
return new CloudId($cloudId, $user, $remote);
}
return new CloudId('[email protected]', 'user', 'someNextcloud.net');
});

Expand All @@ -65,7 +69,8 @@ protected function setUp(): void {
$this->clientService,
$this->userSession,
$this->cloudIdManager,
$this->logger
$this->logger,
null
);
}

Expand Down Expand Up @@ -300,7 +305,9 @@ public function dataSearchEnableDisableLookupServer() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[0]
'shareWith' => $fedIDs[0],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[0]],
],
Expand All @@ -309,7 +316,9 @@ public function dataSearchEnableDisableLookupServer() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[1]
'shareWith' => $fedIDs[1],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[1]],
],
Expand All @@ -318,7 +327,9 @@ public function dataSearchEnableDisableLookupServer() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[2]
'shareWith' => $fedIDs[2],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[2]],
],
Expand All @@ -342,7 +353,9 @@ public function dataSearchEnableDisableLookupServer() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[0]
'shareWith' => $fedIDs[0],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[0]],
],
Expand All @@ -351,7 +364,9 @@ public function dataSearchEnableDisableLookupServer() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[1]
'shareWith' => $fedIDs[1],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[1]],
],
Expand All @@ -360,7 +375,9 @@ public function dataSearchEnableDisableLookupServer() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[2]
'shareWith' => $fedIDs[2],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[2]],
],
Expand Down Expand Up @@ -474,7 +491,9 @@ public function searchDataProvider() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[0]
'shareWith' => $fedIDs[0],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[0]],
],
Expand All @@ -483,7 +502,9 @@ public function searchDataProvider() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[1]
'shareWith' => $fedIDs[1],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[1]],
],
Expand All @@ -492,7 +513,9 @@ public function searchDataProvider() {
'value' => [
'shareType' => IShare::TYPE_REMOTE,
'globalScale' => true,
'shareWith' => $fedIDs[2]
'shareWith' => $fedIDs[2],
'server' => 'enceladus.moon',
'isTrustedServer' => false,
],
'extra' => ['federationId' => $fedIDs[2]],
],
Expand Down
Loading