From 765e00c949344b958d4681c91db8502d150f0353 Mon Sep 17 00:00:00 2001 From: George <57254463+zhoreeq@users.noreply.github.com> Date: Fri, 13 Nov 2020 17:59:05 -0500 Subject: Add NoTLS option to allow plaintext XMPP connections (#1288) Co-authored-by: George --- bridge/config/config.go | 2 +- bridge/xmpp/xmpp.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bridge') diff --git a/bridge/config/config.go b/bridge/config/config.go index a1bce8dc..67a7dc13 100644 --- a/bridge/config/config.go +++ b/bridge/config/config.go @@ -117,7 +117,7 @@ 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 ed99aac2..45c5beb0 100644 --- a/bridge/xmpp/xmpp.go +++ b/bridge/xmpp/xmpp.go @@ -138,14 +138,14 @@ 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() -- cgit v1.2.3