commit 7a3a20901fdfdb27e272f565d1f93f3e9077e215
Author: George <57254463+zhoreeq@users.noreply.github.com>
Date: Fri Nov 13 17:59:05 2020 +0000
Add NoTLS option to allow plaintext XMPP connections (#1288)
Co-authored-by: George <zhoreeq@users.noreply.github.com>
diff --git a/bridge/config/config.go b/bridge/config/config.go
index a1bce8d..67a7dc1 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -1177 +1177 @@ type Protocol struct {
NicksPerRow int // mattermost, slack
NoHomeServerSuffix bool // matrix
NoSendJoinPart bool // all protocols
- NoTLS bool // mattermost
+ NoTLS bool // mattermost, xmpp
Password string // IRC,mattermost,XMPP,matrix
PrefixMessagesWithNick bool // mattemost, slack
PreserveThreading bool // slack
diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go
index ed99aac..45c5beb 100644
--- a/bridge/xmpp/xmpp.go
+++ b/bridge/xmpp/xmpp.go
@@ -13814 +13814 @@ func (b *Bxmpp) createXMPP() error {
User: b.GetString("Jid"),
Password: b.GetString("Password"),
NoTLS: true,
- StartTLS: true,
+ StartTLS: !b.GetBool("NoTLS"),
TLSConfig: tc,
Debug: b.GetBool("debug"),
Session: true,
Status: "",
StatusMessage: "",
Resource: "",
- InsecureAllowUnencryptedAuth: false,
+ InsecureAllowUnencryptedAuth: b.GetBool("NoTLS"),
}
var err error
b.xc, err = options.NewClient()
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 92e0e7c..6b38580 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -2276 +22710 @@ Nick="xmppbot"
#OPTIONAL (default false)
SkipTLSVerify=true
+#Enable to use plaintext connection to your XMPP server.
+#OPTIONAL (default false)
+NoTLS=true
+
## RELOADABLE SETTINGS
## Settings below can be reloaded by editing the file
