Skip to content

[stable28] fix(matterbridge): Check parameters #16527

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
nickvergessen merged 4 commits into from
Dec 11, 2025
Merged

[stable28] fix(matterbridge): Check parameters #16527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37b4790
fix(matterbridge): Check parameters
nickvergessen Dec 10, 2025
e63cf9b
ci: Fix guests app checkout
nickvergessen Dec 11, 2025
983fb38
ci: Fix call-summary bot version
nickvergessen Dec 11, 2025
c36694a
chore: Set version to 18.0.15
nickvergessen Dec 11, 2025
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: 2 additions & 2 deletions .github/workflows/integration-mariadb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ jobs:
test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
server-versions: ['stable28']
guests-versions: ['stable28']
call-summary-bot-versions: ['main']
guests-versions: ['v3.0.1']
call-summary-bot-versions: ['stable30']
notifications-versions: ['stable28']

services:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ jobs:
test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
server-versions: ['stable28']
guests-versions: ['stable28']
call-summary-bot-versions: ['main']
guests-versions: ['v3.0.1']
call-summary-bot-versions: ['stable30']
notifications-versions: ['stable28']

services:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-oci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ jobs:
test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
server-versions: ['stable28']
guests-versions: ['stable28']
call-summary-bot-versions: ['main']
guests-versions: ['v3.0.1']
call-summary-bot-versions: ['stable30']
notifications-versions: ['stable28']

services:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-pgsql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.3']
server-versions: ['stable28']
guests-versions: ['stable28']
call-summary-bot-versions: ['main']
guests-versions: ['v3.0.1']
call-summary-bot-versions: ['stable30']
notifications-versions: ['stable28']

services:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-sqlite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ jobs:
test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
server-versions: ['stable28']
guests-versions: ['stable28']
call-summary-bot-versions: ['main']
guests-versions: ['v3.0.1']
call-summary-bot-versions: ['stable30']
notifications-versions: ['stable28']

steps:
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m

]]></description>

<version>18.0.14</version>
<version>18.0.15</version>
<licence>agpl</licence>

<author>Daniel Calviño Sánchez</author>
Expand Down
19 changes: 18 additions & 1 deletion lib/MatterbridgeManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public function editBridgeOfRoom(Room $room, string $userId, bool $enabled, arra
$newBridge = [
'enabled' => $enabled,
'pid' => $currentBridge['pid'] ?? 0,
'parts' => $parts,
'parts' => $this->validateParts($parts),
];

$this->notify($room, $userId, $currentBridge, $newBridge);
Expand Down Expand Up @@ -351,6 +351,7 @@ private function generatePassword(): string {
private function generateConfig(array $bridge): string {
$content = '';
foreach ($bridge['parts'] as $k => $part) {
$k = (int)$k;
$type = $part['type'];

if ($type === 'nctalk') {
Expand Down Expand Up @@ -507,6 +508,22 @@ private function generateConfig(array $bridge): string {
return $content;
}

protected function validateParts(array $parts): array {
foreach ($parts as $k => $part) {
if (!is_numeric($k)) {
$this->logger->error('User tried to configure a malicious matterbridge setup');
throw new \InvalidArgumentException('Invalid matterbridge parameters');
}
foreach ($part as $key => $value) {
if (preg_match('/["\n]/', $key) || preg_match('/["\n]/', $value)) {
$this->logger->error('User tried to configure a malicious matterbridge setup');
throw new \InvalidArgumentException('Invalid matterbridge parameters');
}
}
}
return $parts;
}

/**
* Remove the scheme from an URL and add port
*
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "18.0.14",
"version": "18.0.15",
"private": true,
"description": "",
"author": "Joas Schilling <[email protected]>",
Expand Down
Loading