Enable inialisation of tls client for dash comms (#1850)

* enable inialisation of tls client for dash comms * remove unneccesary code in client initialisation
TykTechnologies · Aug 9, 2018 · a30cc5e · a30cc5e
1 parent afad576
commit a30cc5e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/api_definition.go b/api_definition.go
@@ -254,9 +254,7 @@ func (a APIDefinitionLoader) FromDashboardService(endpoint, secret string) ([]*A
 
 	newRequest.Header.Set("x-tyk-nonce", ServiceNonce)
 
-	c := &http.Client{
-		Timeout: 120 * time.Second,
-	}
+	c := initialiseClient(120 * time.Second)
 	resp, err := c.Do(newRequest)
 	if err != nil {
 		return nil, err

diff --git a/dashboard_register.go b/dashboard_register.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"crypto/tls"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -35,6 +36,21 @@ type HTTPDashboardHandler struct {
 	heartBeatStopSentinel bool
 }
 
+func initialiseClient(timeout time.Duration) *http.Client {
+	client := &http.Client{}
+	if config.Global().HttpServerOptions.UseSSL {
+		// Setup HTTPS client
+		tlsConfig := &tls.Config{
+			InsecureSkipVerify: config.Global().HttpServerOptions.SSLInsecureSkipVerify,
+		}
+		transport := &http.Transport{TLSClientConfig: tlsConfig}
+		client = &http.Client{Transport: transport, Timeout: timeout}
+	} else {
+		client = &http.Client{Timeout: timeout}
+	}
+	return client
+}
+
 func reLogin() {
 	if !config.Global().UseDBAppConfigs {
 		return
@@ -80,8 +96,7 @@ func (h *HTTPDashboardHandler) Init() error {
 
 func (h *HTTPDashboardHandler) Register() error {
 	req := h.newRequest(h.RegistrationEndpoint)
-
-	c := &http.Client{Timeout: 5 * time.Second}
+	c := initialiseClient(5 * time.Second)
 	resp, err := c.Do(req)
 
 	if err != nil {
@@ -152,8 +167,8 @@ func (h *HTTPDashboardHandler) sendHeartBeat() error {
 	req := h.newRequest(h.HeartBeatEndpoint)
 	req.Header.Set("x-tyk-nodeid", NodeID)
 	req.Header.Set("x-tyk-nonce", ServiceNonce)
+	c := initialiseClient(5 * time.Second)
 
-	c := &http.Client{Timeout: 5 * time.Second}
 	resp, err := c.Do(req)
 	if err != nil || resp.StatusCode != 200 {
 		return errors.New("dashboard is down? Heartbeat is failing")
@@ -178,7 +193,7 @@ func (h *HTTPDashboardHandler) DeRegister() error {
 	req.Header.Set("x-tyk-nodeid", NodeID)
 	req.Header.Set("x-tyk-nonce", ServiceNonce)
 
-	c := &http.Client{Timeout: 5 * time.Second}
+	c := initialiseClient(5 * time.Second)
 	resp, err := c.Do(req)
 
 	if err != nil {

diff --git a/policy.go b/policy.go
@@ -80,9 +80,7 @@ func LoadPoliciesFromDashboard(endpoint, secret string, allowExplicit bool) map[
 	log.WithFields(logrus.Fields{
 		"prefix": "policy",
 	}).Info("Mutex lock acquired... calling")
-	c := &http.Client{
-		Timeout: 10 * time.Second,
-	}
+	c := initialiseClient(10 * time.Second)
 
 	log.WithFields(logrus.Fields{
 		"prefix": "policy",