[stable21] Add support for "turns:" scheme

lib/Config.php

@@ -243,6 +243,10 @@ public function getTurnServers(): array {
 			return [];
 		}
 
+		foreach ($servers as $key => $server) {
+			$servers[$key]['schemes'] = $server['schemes'] ?? 'turn';
+		}
+
 		return $servers;
 	}
 
@@ -256,6 +260,7 @@ public function getTurnSettings(): array {
 
 		if (empty($servers)) {
 			return [
+				'schemes' => '',
 				'server' => '',
 				'username' => '',
 				'password' => '',
@@ -278,6 +283,7 @@ public function getTurnSettings(): array {
 		$password = base64_encode(hash_hmac('sha1', $username, $server['secret'], true));
 
 		return [
+			'schemes' => $server['schemes'],
 			'server' => $server['server'],
 			'username' => $username,
 			'password' => $password,

lib/Controller/SignalingController.php

@@ -147,14 +147,17 @@ public function getSettings(string $apiVersion, string $token = ''): DataRespons
 		$turn = [];
 		$turnSettings = $this->talkConfig->getTurnSettings();
 		if (!empty($turnSettings['server'])) {
+			$schemes = explode(',', $turnSettings['schemes']);
 			$protocols = explode(',', $turnSettings['protocols']);
-			foreach ($protocols as $proto) {
-				$turn[] = [
-					'url' => ['turn:' . $turnSettings['server'] . '?transport=' . $proto],
-					'urls' => ['turn:' . $turnSettings['server'] . '?transport=' . $proto],
-					'username' => $turnSettings['username'],
-					'credential' => $turnSettings['password'],
-				];
+			foreach ($schemes as $scheme) {
+				foreach ($protocols as $proto) {
+					$turn[] = [
+						'url' => [$scheme . ':' . $turnSettings['server'] . '?transport=' . $proto],
+						'urls' => [$scheme . ':' . $turnSettings['server'] . '?transport=' . $proto],
+						'username' => $turnSettings['username'],
+						'credential' => $turnSettings['password'],
+					];
+				}
 			}
 		}
 

src/components/AdminSettings/StunServer.vue

@@ -22,6 +22,8 @@
 
 <template>
 	<div class="stun-server">
+		<!-- "stun:" scheme is untranslated -->
+		<span class="scheme">stun:</span>
 		<input ref="stun_server"
 			type="text"
 			name="stun_server"
@@ -96,6 +98,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.scheme {
+	/* Same margin as inputs to keep the style. */
+	margin: 3px 3px 3px 0;
+}
+
 .stun-server {
 	height: 44px;
 	display: flex;

src/components/AdminSettings/TurnServer.vue

@@ -22,10 +22,28 @@
 
 <template>
 	<div class="turn-server">
+		<select class="schemes"
+			:value="schemes"
+			:disabled="loading"
+			:aria-label="t('spreed', 'TURN server schemes')"
+			@input="updateSchemes">
+			<option value="turn,turns">
+				{{ t('spreed', 'turn: and turns:') }}
+			</option>
+			<option value="turn">
+				{{ t('spreed', 'turn: only') }}
+			</option>
+			<option value="turns">
+				{{ t('spreed', 'turns: only') }}
+			</option>
+		</select>
+
 		<input ref="turn_server"
+			v-tooltip.auto="turnServerError"
 			type="text"
 			name="turn_server"
 			placeholder="turnserver:port"
+			:class="turnServerClasses"
 			:value="server"
 			:disabled="loading"
 			:aria-label="t('spreed', 'TURN server URL')"
@@ -81,6 +99,11 @@ export default {
 	},
 
 	props: {
+		schemes: {
+			type: String,
+			default: '',
+			required: true,
+		},
 		server: {
 			type: String,
 			default: '',
@@ -116,6 +139,18 @@ export default {
 	},
 
 	computed: {
+		turnServerError() {
+			if (this.schemes.includes('turns') && /^(?:\d{1,3}\.){3}\d{1,3}(?::\d{1,5})?$/.test(this.server.trim())) {
+				return t('spreed', 'turns: scheme must be used with a domain')
+			}
+
+			return false
+		},
+		turnServerClasses() {
+			return {
+				'error': this.turnServerError,
+			}
+		},
 		testIconClasses() {
 			return {
 				'icon-category-monitoring': !this.testing && !this.testingError && !this.testingSuccess,
@@ -152,15 +187,17 @@ export default {
 			this.testingError = false
 			this.testingSuccess = false
 
+			const schemes = this.schemes.split(',')
 			const protocols = this.protocols.split(',')
-			if (!this.server || !this.secret || !protocols.length) {
+			if (!schemes.length || !this.server || !this.secret || !protocols.length) {
 				return
 			}
 
 			const urls = []
-			let i
-			for (i = 0; i < protocols.length; i++) {
-				urls.push('turn:' + this.server + '?transport=' + protocols[i])
+			for (let i = 0; i < schemes.length; i++) {
+				for (let j = 0; j < protocols.length; j++) {
+					urls.push(schemes[i] + ':' + this.server + '?transport=' + protocols[j])
+				}
 			}
 
 			const expires = Math.round((new Date()).getTime() / 1000) + (5 * 60)
@@ -265,6 +302,10 @@ export default {
 		removeServer() {
 			this.$emit('removeServer', this.index)
 		},
+		updateSchemes(event) {
+			this.$emit('update:schemes', event.target.value)
+			this.debounceTestServer()
+		},
 		updateServer(event) {
 			this.$emit('update:server', event.target.value)
 			this.debounceTestServer()
@@ -286,5 +327,9 @@ export default {
 	height: 44px;
 	display: flex;
 	align-items: center;
+
+	&.error {
+		border: solid 1px var(--color-error);
+	}
 }
 </style>

src/components/AdminSettings/TurnServers.vue

@@ -41,12 +41,14 @@
 				<TurnServer
 					v-for="(server, index) in servers"
 					:key="`server${index}`"
+					:schemes.sync="servers[index].schemes"
 					:server.sync="servers[index].server"
 					:secret.sync="servers[index].secret"
 					:protocols.sync="servers[index].protocols"
 					:index="index"
 					:loading="loading"
 					@removeServer="removeServer"
+					@update:schemes="debounceUpdateServers"
 					@update:server="debounceUpdateServers"
 					@update:secret="debounceUpdateServers"
 					@update:protocols="debounceUpdateServers" />
@@ -100,6 +102,7 @@ export default {
 
 		newServer() {
 			this.servers.push({
+				schemes: 'turn', // default to turn only
 				server: '',
 				secret: '',
 				protocols: 'udp,tcp', // default to udp AND tcp
@@ -115,6 +118,7 @@ export default {
 
 			this.servers.forEach((server) => {
 				const data = {
+					schemes: server.schemes,
 					server: server.server,
 					secret: server.secret,
 					protocols: server.protocols,

tests/php/ConfigTest.php

@@ -116,11 +116,13 @@ public function testGenerateTurnSettings() {
 			->with('spreed', 'turn_servers', '')
 			->willReturn(json_encode([
 				[
+					// No scheme explicitly given
 					'server' => 'turn.example.org',
 					'secret' => 'thisisasupersecretsecret',
 					'protocols' => 'udp,tcp',
 				],
 				[
+					'schemes' => 'turn,turns',
 					'server' => 'turn2.example.com',
 					'secret' => 'ThisIsAlsoSuperSecret',
 					'protocols' => 'tcp',
@@ -150,13 +152,15 @@ public function testGenerateTurnSettings() {
 		$server = $helper->getTurnSettings();
 		if ($server['server'] === 'turn.example.org') {
 			$this->assertSame([
+				'schemes' => 'turn',
 				'server' => 'turn.example.org',
 				'username' => '1479829425:abcdefghijklmnop',
 				'password' => '4VJLVbihLzuxgMfDrm5C3zy8kLQ=',
 				'protocols' => 'udp,tcp',
 			], $server);
 		} else {
 			$this->assertSame([
+				'schemes' => 'turn,turns',
 				'server' => 'turn2.example.com',
 				'username' => '1479829425:abcdefghijklmnop',
 				'password' => 'Ol9DEqnvyN4g+IAM+vFnqhfWUTE=',