forked from lug/matterbridge
		
	Add NoTLS option to allow plaintext XMPP connections (#1288)
Co-authored-by: George <zhoreeq@users.noreply.github.com>
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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()
 | 
			
		||||
 
 | 
			
		||||
@@ -227,6 +227,10 @@ 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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user