Skip to content

chore(config): refactor all signaling server related configs to AppConfig #19915

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
sudormant merged 3 commits into from
Oct 28, 2026
Merged

chore(config): refactor all signaling server related configs to AppConfig #19915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15cde3c
chore(config): refactor all signaling server related configs to AppCo…
sudormant Sep 8, 2026
360c226
chore(config): remove signaling server secret retrieval logical bug f…
sudormant Oct 26, 2026
0c4d194
fix(test): rework tests after fix for logical bug in retrieving signa…
sudormant Oct 26, 2026
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
26 changes: 6 additions & 20 deletions lib/BackgroundJob/CheckHostedSignalingServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,14 @@ protected function run($argument): void {
if ($oldStatus !== $newStatus) {
if ($newStatus === 'deleted') {
// remove signaling servers if account is not active anymore
$this->appConfig->deleteAppValue('signaling_servers');
//$this->config->deleteAppValue('spreed', 'signaling_servers');
$this->appConfig->deleteAppValue(Config::SIGNALING_SERVERS_SECRET);
$this->appConfig->deleteAppValue(Config::SIGNALING_SERVERS);

$notificationSubject = 'removed';
} elseif ($newStatus === 'active') {
// add signaling servers if account got active
$this->appConfig->setAppValueArray('signaling_servers', [
'servers' => [
[
'server' => $accountInfo['signaling']['url'],
'verify' => true,
]
],
'secret' => $accountInfo['signaling']['secret'],
]);
$this->appConfig->setAppValueArray(Config::SIGNALING_SERVERS, ['servers' => [['server' => $accountInfo['signaling']['url'], 'verify' => true]], 'secret' => $accountInfo['signaling']['secret']]);
$this->appConfig->setAppValueString(Config::SIGNALING_SERVERS_SECRET, $accountInfo['signaling']['secret']);
$this->updateStunTurnSettings($oldAccountInfo, $accountInfo);

$notificationSubject = 'added';
Expand All @@ -161,15 +154,8 @@ protected function run($argument): void {
} elseif ($newStatus === 'active') {
if ($oldAccountInfo['signaling']['url'] !== $accountInfo['signaling']['url']
|| $oldAccountInfo['signaling']['secret'] !== $accountInfo['signaling']['secret']) {
$this->appConfig->setAppValueArray('signaling_servers', [
'servers' => [
[
'server' => $accountInfo['signaling']['url'],
'verify' => true,
]
],
'secret' => $accountInfo['signaling']['secret'],
]);
$this->appConfig->setAppValueArray(Config::SIGNALING_SERVERS, ['servers' => ['server' => $accountInfo['signaling']['url'], 'verify' => true], 'secret' => $accountInfo['signaling']['secret']]);
$this->appConfig->setAppValueString(Config::SIGNALING_SERVERS_SECRET, $accountInfo['signaling']['secret']);
}
$this->updateStunTurnSettings($oldAccountInfo, $accountInfo);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Capabilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public function getCapabilities(): array {
'typing-privacy' => Participant::PRIVACY_PUBLIC,
'summary-threshold' => max(1, $this->appConfig->getAppValueInt(Config::SUMMARY_THRESHOLD)),
'style' => $this->talkConfig->getChatStyle($user?->getUID()),
'matterbridge-enabled' => $user instanceof IUser && $this->serverConfig->getAppValue('spreed', 'enable_matterbridge', '0') === '1',
'matterbridge-enabled' => $user instanceof IUser && $this->appConfig->getAppValueBool(Config::MATTERBRIDGE_ENABLED),
],
'conversations' => [
'can-create' => $user instanceof IUser && !$this->talkConfig->isNotAllowedToCreateConversations($user),
Expand Down
2 changes: 0 additions & 2 deletions lib/Chat/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use OCP\AppFramework\Services\IAppConfig;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Comments\IComment;
use OCP\IConfig;
use OCP\IGroup;
use OCP\IGroupManager;
use OCP\IUserManager;
Expand All @@ -47,7 +46,6 @@ public function __construct(
private readonly IGroupManager $groupManager,
private readonly ParticipantService $participantService,
private readonly ThreadService $threadService,
private readonly IConfig $config,
private readonly IAppConfig $appConfig,
private readonly ITimeFactory $timeFactory,
private readonly Util $util,
Expand Down
15 changes: 8 additions & 7 deletions lib/Command/Signaling/Add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
namespace OCA\Talk\Command\Signaling;

use OC\Core\Command\Base;
use OCP\IConfig;
use OCA\Talk\Config;
use OCP\AppFramework\Services\IAppConfig;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
Expand All @@ -18,7 +19,7 @@
class Add extends Base {

public function __construct(
private readonly IConfig $config,
private readonly IAppConfig $appConfig,
) {
parent::__construct();
}
Expand Down Expand Up @@ -59,13 +60,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
return 1;
}

$config = $this->config->getAppValue('spreed', 'signaling_servers');
$signaling_servers = $this->appConfig->getAppValueArray(Config::SIGNALING_SERVERS);

$signaling = json_decode($config, true);
if ($signaling === null || empty($signaling) || !is_array($signaling)) {
if (empty($signaling_servers)) {
$servers = [];
} else {
$servers = is_array($signaling['servers']) ? $signaling['servers'] : [];
$servers = $signaling_servers['servers'];
}
$servers[] = [
'server' => $server,
Expand All @@ -76,7 +76,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
'secret' => $secret,
];

$this->config->setAppValue('spreed', 'signaling_servers', json_encode($signaling));
$this->appConfig->setAppValueArray(Config::SIGNALING_SERVERS, $signaling);
$this->appConfig->setAppValueString(Config::SIGNALING_SERVERS_SECRET, $signaling['secret']);
$output->writeln('<info>Added signaling server ' . $server . '.</info>');
return 0;
}
Expand Down
13 changes: 7 additions & 6 deletions lib/Command/Signaling/Delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@
namespace OCA\Talk\Command\Signaling;

use OC\Core\Command\Base;
use OCP\IConfig;
use OCA\Talk\Config;
use OCP\AppFramework\Services\IAppConfig;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

class Delete extends Base {

public function __construct(
private readonly IConfig $config,
private readonly IAppConfig $appConfig,
) {
parent::__construct();
}
Expand All @@ -37,9 +38,8 @@ protected function configure(): void {
protected function execute(InputInterface $input, OutputInterface $output): int {
$server = $input->getArgument('server');

$config = $this->config->getAppValue('spreed', 'signaling_servers');
$signaling = json_decode($config, true);
if ($signaling === null || empty($signaling) || !is_array($signaling)) {
$signaling = $this->appConfig->getAppValueArray(Config::SIGNALING_SERVERS);
if (empty($signaling)) {
$signaling = [
'servers' => [],
'secret' => '',
Expand All @@ -50,7 +50,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$servers = array_filter($signaling['servers'], fn ($s) => $s['server'] !== $server);
$signaling['servers'] = array_values($servers); // reindex

$this->config->setAppValue('spreed', 'signaling_servers', json_encode($signaling));
$this->appConfig->setAppValueArray(Config::SIGNALING_SERVERS, $signaling);
$this->appConfig->setAppValueString(Config::SIGNALING_SERVERS_SECRET, $signaling['secret']);
if ($count > count($signaling['servers'])) {
$output->writeln('<info>Deleted ' . $server . '.</info>');
} else {
Expand Down
11 changes: 4 additions & 7 deletions lib/Command/Signaling/ListCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
namespace OCA\Talk\Command\Signaling;

use OC\Core\Command\Base;
use OCP\IConfig;
use OCA\Talk\Config;
use OCP\AppFramework\Services\IAppConfig;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

class ListCommand extends Base {

public function __construct(
private readonly IConfig $config,
private readonly IAppConfig $appConfig,
) {
parent::__construct();
}
Expand All @@ -31,11 +32,7 @@ protected function configure(): void {
}

protected function execute(InputInterface $input, OutputInterface $output): int {
$config = $this->config->getAppValue('spreed', 'signaling_servers');
$signaling = json_decode($config, true);
if (!is_array($signaling)) {
$signaling = [];
}
$signaling = $this->appConfig->getAppValueArray(Config::SIGNALING_SERVERS);

$this->writeMixedInOutputFormat($input, $output, $signaling);
return 0;
Expand Down
6 changes: 3 additions & 3 deletions lib/Command/Signaling/VerifyKeys.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

use OC\Core\Command\Base;
use OCA\Talk\Config;
use OCP\IConfig;
use OCP\AppFramework\Services\IAppConfig;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;

class VerifyKeys extends Base {

public function __construct(
private readonly IConfig $config,
private readonly Config $talkConfig,
private readonly IAppConfig $appConfig,
) {
parent::__construct();
}
Expand Down Expand Up @@ -51,7 +51,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
if ($update) {
$output->writeln('<comment>Stored public key for algorithm ' . strtolower($alg) . ' did not match stored private key.</comment>');
$output->writeln('<info>A new public key was created and stored.</info>');
$this->config->setAppValue('spreed', 'signaling_token_pubkey_' . strtolower($alg), $publicKeyDerived);
$this->appConfig->setAppValueString('signaling_token_pubkey_' . strtolower($alg), $publicKeyDerived);

return 0;
}
Expand Down
Loading
Loading