gered/nats-cli
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add "tlsverify" option

Browse source
This commit is contained in:
Gered 2018-01-16 14:21:35 -05:00
parent 7837683ce3
commit 64e0600655
4 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -7,9 +7,9 @@ supported TLS connections to the NATS server, which I need.
Includes: Includes:
``` ```
nats-pub [-s server] [-tls] [-tlscert CERT_FILE] [-tlskey KEY_FILE] [-tlscacert CA_FILE] <subject> <message> nats-pub [-s server] [-tls] [-tlscert CERT_FILE] [-tlskey KEY_FILE] [-tlscacert CA_FILE] [-tlsverify] <subject> <message>
nats-sub [-s server] [-ts] [-tls] [-tlscert CERT_FILE] [-tlskey KEY_FILE] [-tlscacert CA_FILE] <subject> nats-sub [-s server] [-ts] [-tls] [-tlscert CERT_FILE] [-tlskey KEY_FILE] [-tlscacert CA_FILE] [-tlsverify] <subject>
``` ```

5
nats-pub/app.go
View file

@ -9,7 +9,7 @@ import (
) )
func usage() { func usage() {
log.Fatalf("nats-pub [-s server] [-tls] [-tlscert CERT_FILE] [-tlskey KEY_FILE] [-tlscacert CA_FILE] <subject> <message>") log.Fatalf("nats-pub [-s server] [-tls] [-tlscert CERT_FILE] [-tlskey KEY_FILE] [-tlscacert CA_FILE] [-tlsverify] <subject> <message>")
} }
func main() { func main() {
@ -20,6 +20,7 @@ func main() {
var tlsCertPath = flag.String("tlscert", "", "Certificate file") var tlsCertPath = flag.String("tlscert", "", "Certificate file")
var tlsKeyPath = flag.String("tlskey", "", "Private key file for certificate") var tlsKeyPath = flag.String("tlskey", "", "Private key file for certificate")
var tlsCACertPath = flag.String("tlscacert", "", "Client certificate CA file") var tlsCACertPath = flag.String("tlscacert", "", "Client certificate CA file")
var tlsVerify = flag.Bool("tlsverify", true, "Enable TLS connection verification")
flag.Usage = usage flag.Usage = usage
flag.Parse() flag.Parse()
@ -31,7 +32,7 @@ func main() {
var subject = flag.Arg(0) var subject = flag.Arg(0)
var message = flag.Arg(1) var message = flag.Arg(1)
conn, err := nc.Connect(*url, *tls, *tlsCertPath, *tlsKeyPath, *tlsCACertPath) conn, err := nc.Connect(*url, *tls, *tlsCertPath, *tlsKeyPath, *tlsCACertPath, *tlsVerify)
if err != nil { if err != nil {
log.Fatalf("Failed to connect to NATS: %s", err) log.Fatalf("Failed to connect to NATS: %s", err)
} }

5
nats-sub/app.go
View file

@ -11,7 +11,7 @@ import (
) )
func usage() { func usage() {
log.Fatalf("nats-sub [-s server] [-ts] [-tls] [-tlscert CERT_FILE] [-tlskey KEY_FILE] [-tlscacert CA_FILE] <subject>") log.Fatalf("nats-sub [-s server] [-ts] [-tls] [-tlscert CERT_FILE] [-tlskey KEY_FILE] [-tlscacert CA_FILE] [-tlsverify] <subject>")
} }
func main() { func main() {
@ -23,6 +23,7 @@ func main() {
var tlsCertPath = flag.String("tlscert", "", "Certificate file") var tlsCertPath = flag.String("tlscert", "", "Certificate file")
var tlsKeyPath = flag.String("tlskey", "", "Private key file for certificate") var tlsKeyPath = flag.String("tlskey", "", "Private key file for certificate")
var tlsCACertPath = flag.String("tlscacert", "", "Client certificate CA file") var tlsCACertPath = flag.String("tlscacert", "", "Client certificate CA file")
var tlsVerify = flag.Bool("tlsverify", false, "Enable TLS connection verification")
flag.Usage = usage flag.Usage = usage
flag.Parse() flag.Parse()
@ -38,7 +39,7 @@ func main() {
log.SetFlags(log.LstdFlags) log.SetFlags(log.LstdFlags)
} }
conn, err := nc.Connect(*url, *tls, *tlsCertPath, *tlsKeyPath, *tlsCACertPath) conn, err := nc.Connect(*url, *tls, *tlsCertPath, *tlsKeyPath, *tlsCACertPath, *tlsVerify)
if err != nil { if err != nil {
log.Fatalf("Failed to connect to NATS: %s", err) log.Fatalf("Failed to connect to NATS: %s", err)
} }

19
nats.go
View file

@ -2,11 +2,11 @@ package nats_cli
import ( import (
"errors" "errors"
ctls "crypto/tls"
"github.com/nats-io/nats" "github.com/nats-io/nats"
) )
func Connect(url string, tls bool, certPath string, keyPath string, caCertPath string) (*nats.Conn, error) { func Connect(url string, tls bool, certPath string, keyPath string, caCertPath string, verify bool) (*nats.Conn, error) {
if tls { if tls {
if len(certPath) == 0 { if len(certPath) == 0 {
return nil, errors.New("tlscert not set") return nil, errors.New("tlscert not set")
@ -19,10 +19,19 @@ func Connect(url string, tls bool, certPath string, keyPath string, caCertPath s
var conn *nats.Conn var conn *nats.Conn
var err error var err error
if len(caCertPath) > 0 { tlsverify := func(o *nats.Options) error {
conn, err = nats.Connect(url, nats.RootCAs(caCertPath), cert) if o.TLSConfig == nil {
o.TLSConfig.InsecureSkipVerify = !verify
} else { } else {
conn, err = nats.Connect(url, cert) o.TLSConfig = &ctls.Config{InsecureSkipVerify: !verify}
}
return nil
}
if len(caCertPath) > 0 {
conn, err = nats.Connect(url, nats.RootCAs(caCertPath), cert, tlsverify)
} else {
conn, err = nats.Connect(url, cert, tlsverify)
} }
if err != nil { if err != nil {