Merge pull request #96 from nats-io/force-tls-option

wallyqs · web-flow · commit bd232ef33760 · 2023-12-01T11:22:13.000-08:00
Add SASL TLS option to always use tls
diff --git a/server/conf/conf.go b/server/conf/conf.go
@@ -85,12 +85,13 @@ type TLSConf struct {
 	Root string
 }
 
-// SASL holds the configuration for SASL authentication.
+// SASL holds the configuration for SASL authentication with Kafka.
 type SASL struct {
 	User               string
 	Password           string
 	InsecureSkipVerify bool
 	Mechanism          string
+	TLS                bool
 }
 
 // MakeTLSConfig creates a tls.Config from a TLSConf, setting up the key pairs and certs
diff --git a/server/kafka/producer.go b/server/kafka/producer.go
@@ -96,6 +96,9 @@ func NewProducer(cc conf.ConnectorConfig, bc conf.NATSKafkaBridgeConfig, topic s
 		sc.Net.TLS.Enable = true
 		sc.Net.TLS.Config = tlsC
 	}
+	if cc.SASL.TLS {
+		sc.Net.TLS.Enable = cc.SASL.TLS
+	}
 
 	sp, err := sarama.NewSyncProducer(cc.Brokers, sc)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,13 @@ type TLSConf struct {`
`85`	`85`	`Root string`
`86`	`86`	`}`
`87`	`87`
`88`		`-// SASL holds the configuration for SASL authentication.`
	`88`	`+// SASL holds the configuration for SASL authentication with Kafka.`
`89`	`89`	`type SASL struct {`
`90`	`90`	`User string`
`91`	`91`	`Password string`
`92`	`92`	`InsecureSkipVerify bool`
`93`	`93`	`Mechanism string`
	`94`	`+ TLS bool`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`// MakeTLSConfig creates a tls.Config from a TLSConf, setting up the key pairs and certs`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,9 @@ func NewProducer(cc conf.ConnectorConfig, bc conf.NATSKafkaBridgeConfig, topic s`
`96`	`96`	`sc.Net.TLS.Enable = true`
`97`	`97`	`sc.Net.TLS.Config = tlsC`
`98`	`98`	`}`
	`99`	`+ if cc.SASL.TLS {`
	`100`	`+ sc.Net.TLS.Enable = cc.SASL.TLS`
	`101`	`+ }`
`99`	`102`
`100`	`103`	`sp, err := sarama.NewSyncProducer(cc.Brokers, sc)`
`101`	`104`	`if err != nil {`