Thumbnail

rani/matterbridge.git

Clone URL: https://git.buni.party/rani/matterbridge.git

commit 40d93300ecbb84c1527b83f035be9257e10154dc Author: tytan652 <17492366+tytan652@users.noreply.github.com> Date: Sat Jul 31 17:26:36 2021 +0000 Add support for anonymous connection (xmpp) (#1548) diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go index 07ae8a2..6a0564e 100644 --- a/bridge/xmpp/xmpp.go +++ b/bridge/xmpp/xmpp.go @@ -16911 +16921 @@ func (b *Bxmpp) postSlackCompatibleWebhook(msg config.Message) error {  }    func (b *Bxmpp) createXMPP() error { - if !strings.Contains(b.GetString("Jid"), "@") { - return fmt.Errorf("the Jid %s doesn't contain an @", b.GetString("Jid")) + var serverName string + switch { + case !b.GetBool("Anonymous"): + if !strings.Contains(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{ - ServerName: strings.Split(b.GetString("Jid"), "@")[1], + ServerName: serverName,   InsecureSkipVerify: b.GetBool("SkipTLSVerify"), // nolint: gosec   }   diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample index 9e32b49..b622175 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -22312 +22316 @@ UseRelayMsg=false  #REQUIRED  Server="jabber.example.com:5222"   +#Use anonymous MUC login +#OPTIONAL (default false) +Anonymous=false +  #Jid -#REQUIRED +#REQUIRED if Anonymous=false  Jid="user@example.com"    #Password -#REQUIRED +#REQUIRED if Anonymous=false  Password="yourpass"    #MUC