UPSTREAM BASELINE: nextcloud/spreed v22.0.12 (без изменений)

Источник: https://github.com/nextcloud/spreed/archive/refs/tags/v22.0.12.tar.gz
С этого коммита ветка официального Nextcloud Talk отрезана (решение владельца 2026-07-06).
Все дальнейшие изменения — только наши; версии релизов: 22.0.12-f7.N.

lib/Command/Signaling/Add.php

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Command\Signaling;
+
+use OC\Core\Command\Base;
+use OCP\IConfig;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Add extends Base {
+
+	public function __construct(
+		private IConfig $config,
+	) {
+		parent::__construct();
+	}
+
+	#[\Override]
+	protected function configure(): void {
+		$this
+			->setName('talk:signaling:add')
+			->setDescription('Add an external signaling server.')
+			->addArgument(
+				'server',
+				InputArgument::REQUIRED,
+				'A server string, ex. wss://signaling.example.org'
+			)->addArgument(
+				'secret',
+				InputArgument::REQUIRED,
+				'A shared secret string.'
+			)->addOption(
+				'verify',
+				null,
+				InputOption::VALUE_NONE,
+				'Validate SSL certificate if set.'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$server = $input->getArgument('server');
+		$secret = $input->getArgument('secret');
+		$verify = $input->getOption('verify');
+
+		// quick validation, similar to signaling-server.js
+		if (trim($server) === '') {
+			$output->writeln('<error>Server cannot be empty.</error>');
+			return 1;
+		}
+		if (trim($secret) === '') {
+			$output->writeln('<error>Secret cannot be empty.</error>');
+			return 1;
+		}
+
+		$config = $this->config->getAppValue('spreed', 'signaling_servers');
+
+		$signaling = json_decode($config, true);
+		if ($signaling === null || empty($signaling) || !is_array($signaling)) {
+			$servers = [];
+		} else {
+			$servers = is_array($signaling['servers']) ? $signaling['servers'] : [];
+		}
+		$servers[] = [
+			'server' => $server,
+			'verify' => $verify,
+		];
+		$signaling = [
+			'servers' => $servers,
+			'secret' => $secret,
+		];
+
+		$this->config->setAppValue('spreed', 'signaling_servers', json_encode($signaling));
+		$output->writeln('<info>Added signaling server ' . $server . '.</info>');
+		return 0;
+	}
+}

lib/Command/Signaling/Delete.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Command\Signaling;
+
+use OC\Core\Command\Base;
+use OCP\IConfig;
+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 IConfig $config,
+	) {
+		parent::__construct();
+	}
+
+	#[\Override]
+	protected function configure(): void {
+		$this
+			->setName('talk:signaling:delete')
+			->setDescription('Remove an existing signaling server.')
+			->addArgument(
+				'server',
+				InputArgument::REQUIRED,
+				'An external signaling server string, ex. wss://signaling.example.org'
+			);
+	}
+
+	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 = [
+				'servers' => [],
+				'secret' => '',
+			];
+		}
+		$count = count($signaling['servers']);
+		// remove all occurrences of $server
+		$servers = array_filter($signaling['servers'], function ($s) use ($server) {
+			return $s['server'] !== $server;
+		});
+		$signaling['servers'] = array_values($servers); // reindex
+
+		$this->config->setAppValue('spreed', 'signaling_servers', json_encode($signaling));
+		if ($count > count($signaling['servers'])) {
+			$output->writeln('<info>Deleted ' . $server . '.</info>');
+		} else {
+			$output->writeln('<info>There is nothing to delete.</info>');
+		}
+		return 0;
+	}
+}

lib/Command/Signaling/ListCommand.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Command\Signaling;
+
+use OC\Core\Command\Base;
+use OCP\IConfig;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ListCommand extends Base {
+
+	public function __construct(
+		private IConfig $config,
+	) {
+		parent::__construct();
+	}
+
+	#[\Override]
+	protected function configure(): void {
+		parent::configure();
+
+		$this
+			->setName('talk:signaling:list')
+			->setDescription('List external signaling servers.');
+	}
+
+	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 = [];
+		}
+
+		$this->writeMixedInOutputFormat($input, $output, $signaling);
+		return 0;
+	}
+}

lib/Command/Signaling/VerifyKeys.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Command\Signaling;
+
+use OC\Core\Command\Base;
+use OCA\Talk\Config;
+use OCP\IConfig;
+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 IConfig $config,
+		private Config $talkConfig,
+	) {
+		parent::__construct();
+	}
+
+	#[\Override]
+	protected function configure(): void {
+		parent::configure();
+
+		$this
+			->setName('talk:signaling:verify-keys')
+			->setDescription('Verify if the stored public key matches the stored private key for the signaling server')
+			->addOption('update', null, InputOption::VALUE_NONE, 'Updates the stored public key to match the private key if there is a mis-match');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$update = $input->getOption('update');
+
+		$alg = $this->talkConfig->getSignalingTokenAlgorithm();
+		$privateKey = $this->talkConfig->getSignalingTokenPrivateKey();
+		$publicKey = $this->talkConfig->getSignalingTokenPublicKey();
+		$publicKeyDerived = $this->talkConfig->deriveSignalingTokenPublicKey($privateKey, $alg);
+
+		$output->writeln('Stored public key:');
+		$output->writeln($publicKey);
+		$output->writeln('Derived public key:');
+		$output->writeln($publicKeyDerived);
+
+		if ($publicKey != $publicKeyDerived) {
+			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);
+
+				return 0;
+			}
+
+			$output->writeln('<error>Stored public key for algorithm ' . strtolower($alg) . ' does not match stored private key</error>');
+			return 1;
+		}
+
+		$output->writeln('<info>Stored public key for algorithm ' . strtolower($alg) . ' matches stored private key</info>');
+
+		return 0;
+	}
+}