From a6ce435a072ba1a4569fce2127e51b14cd22d581 Mon Sep 17 00:00:00 2001
From: Asim <asim@chuhnk.me>
Date: Sun, 17 Jan 2016 00:33:07 +0000
Subject: [PATCH] If secure or tlsconfig not nil then secure

---
 broker/http_broker.go       | 24 +++++++++++++++++-------
 registry/consul_registry.go |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/broker/http_broker.go b/broker/http_broker.go
index bface133..ed5c3d70 100644
--- a/broker/http_broker.go
+++ b/broker/http_broker.go
@@ -65,7 +65,13 @@ func init() {
 	rand.Seed(time.Now().Unix())
 }
 
-func newTransport() *http.Transport {
+func newTransport(config *tls.Config) *http.Transport {
+	if config == nil {
+		config = &tls.Config{
+			InsecureSkipVerify: true,
+		}
+	}
+
 	t := &http.Transport{
 		Proxy: http.ProxyFromEnvironment,
 		Dial: (&net.Dialer{
@@ -73,9 +79,7 @@ func newTransport() *http.Transport {
 			KeepAlive: 30 * time.Second,
 		}).Dial,
 		TLSHandshakeTimeout: 10 * time.Second,
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-		},
+		TLSClientConfig: config,
 	}
 	runtime.SetFinalizer(&t, func(tr **http.Transport) {
 		(*tr).CloseIdleConnections()
@@ -98,7 +102,7 @@ func newHttpBroker(addrs []string, opts ...Option) Broker {
 		id:          "broker-" + uuid.NewUUID().String(),
 		address:     addr,
 		opts:        options,
-		c:           &http.Client{Transport: newTransport()},
+		c:           &http.Client{Transport: newTransport(options.TLSConfig)},
 		subscribers: make(map[string][]*httpSubscriber),
 		unsubscribe: make(chan *httpSubscriber),
 		exit:        make(chan chan error),
@@ -143,7 +147,7 @@ func (h *httpBroker) start() error {
 	var l net.Listener
 	var err error
 
-	if h.opts.Secure {
+	if h.opts.Secure || h.opts.TLSConfig != nil {
 		config := h.opts.TLSConfig
 		if config == nil {
 			cert, err := mls.Certificate(h.address)
@@ -342,13 +346,19 @@ func (h *httpBroker) Subscribe(topic string, handler Handler, opts ...SubscribeO
 
 	id := uuid.NewUUID().String()
 
+	var secure bool
+
+	if h.opts.Secure || h.opts.TLSConfig != nil {
+		secure = true
+	}
+
 	// register service
 	node := &registry.Node{
 		Id:      h.id + "." + id,
 		Address: host,
 		Port:    port,
 		Metadata: map[string]string{
-			"secure": fmt.Sprintf("%t", h.opts.Secure),
+			"secure": fmt.Sprintf("%t", secure),
 		},
 	}
 
diff --git a/registry/consul_registry.go b/registry/consul_registry.go
index e80a7fa2..03918be5 100644
--- a/registry/consul_registry.go
+++ b/registry/consul_registry.go
@@ -121,7 +121,7 @@ func newConsulRegistry(addrs []string, opts ...Option) Registry {
 	}
 
 	// requires secure connection?
-	if opt.Secure {
+	if opt.Secure || opt.TLSConfig != nil {
 		config.Scheme = "https"
 		// We're going to support InsecureSkipVerify
 		config.HttpClient.Transport = newTransport(opt.TLSConfig)