jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-29 22:22:01 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for anonymous connection (xmpp) (#1548)

Browse Source
This commit is contained in:
tytan652 2021-07-31 17:26:36 +02:00 committed by GitHub
parent 9efcc41ab2
commit 1f365c716e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bridge/xmpp/xmpp.go
View File

@ -169,11 +169,21 @@ func (b *Bxmpp) postSlackCompatibleWebhook(msg config.Message) error {
} }
func (b *Bxmpp) createXMPP() error { func (b *Bxmpp) createXMPP() error {
var serverName string
switch {
case !b.GetBool("Anonymous"):
if !strings.Contains(b.GetString("Jid"), "@") { if !strings.Contains(b.GetString("Jid"), "@") {
return fmt.Errorf("the Jid %s doesn't contain an @", b.GetString("Jid")) return fmt.Errorf("the Jid %s doesn't contain an @", b.GetString("Jid"))
} }
serverName = strings.Split(b.GetString("Jid"), "@")[1]
case !strings.Contains(b.GetString("Server"), ":"):
serverName = strings.Split(b.GetString("Server"), ":")[0]
default:
serverName = b.GetString("Server")
}
tc := &tls.Config{ tc := &tls.Config{
ServerName: strings.Split(b.GetString("Jid"), "@")[1], ServerName: serverName,
InsecureSkipVerify: b.GetBool("SkipTLSVerify"), // nolint: gosec InsecureSkipVerify: b.GetBool("SkipTLSVerify"), // nolint: gosec
} }

8
matterbridge.toml.sample
View File

@ -223,12 +223,16 @@ UseRelayMsg=false
#REQUIRED #REQUIRED
Server="jabber.example.com:5222" Server="jabber.example.com:5222"
#Use anonymous MUC login
#OPTIONAL (default false)
Anonymous=false
#Jid #Jid
#REQUIRED #REQUIRED if Anonymous=false
Jid="user@example.com" Jid="user@example.com"
#Password #Password
#REQUIRED #REQUIRED if Anonymous=false
Password="yourpass" Password="yourpass"
#MUC #MUC