Skip to content

[stable31] fix: Fix getting trusted server other than the first #54381

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
kesselb merged 1 commit into from
Aug 28, 2025
Merged

[stable31] fix: Fix getting trusted server other than the first #54381

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
fix: Fix getting trusted server other than the first 
"array_filter" preserves the keys, so after the trusted servers were
filtered "$server[0]" existed only if the server to get was the first
one in the original array.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Aug 28, 2025
commit 9b691c288499230696f8537fbae72e5e4d03295d
9 changes: 5 additions & 4 deletions apps/federation/lib/TrustedServers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,13 @@ public function getServer(int $id): ?array {
$this->trustedServersCache = $this->dbHandler->getAllServer();
}

$server = array_filter($this->trustedServersCache, fn ($server) => $server['id'] === $id);
if (empty($server)) {
throw new \Exception('No server found with ID: ' . $id);
foreach ($this->trustedServersCache as $server) {
if ($server['id'] === $id) {
return $server;
}
}

return $server[0];
throw new \Exception('No server found with ID: ' . $id);
}

/**
Expand Down
60 changes: 60 additions & 0 deletions apps/federation/tests/TrustedServersTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,66 @@ public function testGetServers(): void {
);
}

public static function dataTestGetServer() {
return [
[
15,
[
'id' => 15,
'otherData' => 'first server',
]
],
[
16,
[
'id' => 16,
'otherData' => 'second server',
]
],
[
42,
[
'id' => 42,
'otherData' => 'last server',
]
],
[
108,
null
],
];
}

/**
* @dataProvider dataTestGetServer
*/
public function testGetServer(int $id, ?array $expectedServer): void {
$servers = [
[
'id' => 15,
'otherData' => 'first server',
],
[
'id' => 16,
'otherData' => 'second server',
],
[
'id' => 42,
'otherData' => 'last server',
],
];
$this->dbHandler->expects($this->once())->method('getAllServer')->willReturn($servers);

if ($expectedServer === null) {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('No server found with ID: ' . $id);
}

$this->assertEquals(
$expectedServer,
$this->trustedServers->getServer($id)
);
}

public function testIsTrustedServer(): void {
$this->dbHandler->expects($this->once())
Expand Down
Loading