Browse Source

fix(matterbridge): skip TLS for NC Talk

- Matterbridge has two gateways:
  - local - always NC Talk - we 'trust' it and skip verifying
  - target - could be NC Talk (same or another) - checkbox is added to skip verifying

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
pull/13768/head
Maksim Sukharev 1 year ago
parent
commit
2a46db7acb
  1. 4
      lib/MatterbridgeManager.php
  2. 4
      src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts

4
lib/MatterbridgeManager.php

@ -229,6 +229,7 @@ class MatterbridgeManager {
'login' => $botInfo['id'],
'password' => $botInfo['password'],
'channel' => $room->getToken(),
'skiptls' => true,
];
$bridge['parts'][] = $localPart;
return $bridge;
@ -346,6 +347,9 @@ class MatterbridgeManager {
// TODO remove that
//$serverUrl = preg_replace('/https:/', 'http:', $serverUrl);
}
if ($part['skiptls']) {
$content .= ' SkipTLSVerify = true' . "\n";
}
$content .= sprintf(' Server = "%s"', $serverUrl) . "\n";
$content .= sprintf(' Login = "%s"', $part['login']) . "\n";
$content .= sprintf(' Password = "%s"', $part['password']) . "\n";

4
src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts

@ -48,6 +48,10 @@ export const matterbridgeTypes: Record<string, MatterbridgeType> = {
placeholder: t('spreed', 'Talk conversation'),
icon: 'icon-group',
},
skiptls: {
type: 'checkbox',
labelText: t('spreed', 'Skip TLS verification'),
},
},
mainField: 'server',
},

Loading…
Cancel
Save