extract parsing of datasource tls config to method

pkg/models/datasource_cache.go

@@ -46,19 +46,16 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
 		return t.Transport, nil
 	}
 
-	var tlsSkipVerify, tlsClientAuth, tlsAuthWithCACert bool
+	tlsConfig, err := ds.GetTLSConfig()
-	if ds.JsonData != nil {
+	if err != nil {
-		tlsClientAuth = ds.JsonData.Get("tlsAuth").MustBool(false)
+		return nil, err
-		tlsAuthWithCACert = ds.JsonData.Get("tlsAuthWithCACert").MustBool(false)
-		tlsSkipVerify = ds.JsonData.Get("tlsSkipVerify").MustBool(false)
 	}
 
+	tlsConfig.Renegotiation = tls.RenegotiateFreelyAsClient
+
 	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{
+		TLSClientConfig: tlsConfig,
-			InsecureSkipVerify: tlsSkipVerify,
+		Proxy:           http.ProxyFromEnvironment,
-			Renegotiation:      tls.RenegotiateFreelyAsClient,
-		},
-		Proxy: http.ProxyFromEnvironment,
 		Dial: (&net.Dialer{
 			Timeout:   30 * time.Second,
 			KeepAlive: 30 * time.Second,
@@ -70,6 +67,26 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
 		IdleConnTimeout:       90 * time.Second,
 	}
 
+	ptc.cache[ds.Id] = cachedTransport{
+		Transport: transport,
+		updated:   ds.Updated,
+	}
+
+	return transport, nil
+}
+
+func (ds *DataSource) GetTLSConfig() (*tls.Config, error) {
+	var tlsSkipVerify, tlsClientAuth, tlsAuthWithCACert bool
+	if ds.JsonData != nil {
+		tlsClientAuth = ds.JsonData.Get("tlsAuth").MustBool(false)
+		tlsAuthWithCACert = ds.JsonData.Get("tlsAuthWithCACert").MustBool(false)
+		tlsSkipVerify = ds.JsonData.Get("tlsSkipVerify").MustBool(false)
+	}
+
+	tlsConfig := &tls.Config{
+		InsecureSkipVerify: tlsSkipVerify,
+	}
+
 	if tlsClientAuth || tlsAuthWithCACert {
 		decrypted := ds.SecureJsonData.Decrypt()
 		if tlsAuthWithCACert && len(decrypted["tlsCACert"]) > 0 {
@@ -78,7 +95,7 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
 			if !ok {
 				return nil, errors.New("Failed to parse TLS CA PEM certificate")
 			}
-			transport.TLSClientConfig.RootCAs = caPool
+			tlsConfig.RootCAs = caPool
 		}
 
 		if tlsClientAuth {
@@ -86,14 +103,9 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
 			if err != nil {
 				return nil, err
 			}
-			transport.TLSClientConfig.Certificates = []tls.Certificate{cert}
+			tlsConfig.Certificates = []tls.Certificate{cert}
 		}
 	}
 
-	ptc.cache[ds.Id] = cachedTransport{
+	return tlsConfig, nil
-		Transport: transport,
-		updated:   ds.Updated,
-	}
-
-	return transport, nil
 }

pkg/tsdb/mysql/mysql.go

@@ -2,15 +2,11 @@ package mysql
 
 import (
 	"database/sql"
-	"errors"
 	"fmt"
 	"reflect"
 	"strconv"
 	"strings"
 
-	"crypto/tls"
-	"crypto/x509"
-
 	"github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/core"
 	"github.com/grafana/grafana/pkg/log"
@@ -37,42 +33,13 @@ func newMysqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
 		datasource.Database,
 	)
 
-	var tlsSkipVerify, tlsAuth, tlsAuthWithCACert bool
+	tlsConfig, err := datasource.GetTLSConfig()
-	if datasource.JsonData != nil {
+	if err != nil {
-		tlsAuth = datasource.JsonData.Get("tlsAuth").MustBool(false)
+		return nil, err
-		tlsAuthWithCACert = datasource.JsonData.Get("tlsAuthWithCACert").MustBool(false)
-		tlsSkipVerify = datasource.JsonData.Get("tlsSkipVerify").MustBool(false)
 	}
 
-	if tlsAuth || tlsAuthWithCACert {
+	if tlsConfig.RootCAs != nil || len(tlsConfig.Certificates) > 0 {
-
+		mysql.RegisterTLSConfig(datasource.Name, tlsConfig)
-		secureJsonData := datasource.SecureJsonData.Decrypt()
-		tlsConfig := tls.Config{
-			InsecureSkipVerify: tlsSkipVerify,
-		}
-
-		if tlsAuthWithCACert && len(secureJsonData["tlsCACert"]) > 0 {
-
-			caPool := x509.NewCertPool()
-			if ok := caPool.AppendCertsFromPEM([]byte(secureJsonData["tlsCACert"])); !ok {
-				return nil, errors.New("Failed to parse TLS CA PEM certificate")
-			}
-
-			tlsConfig.RootCAs = caPool
-		}
-
-		if tlsAuth {
-			certs, err := tls.X509KeyPair([]byte(secureJsonData["tlsClientCert"]), []byte(secureJsonData["tlsClientKey"]))
-			if err != nil {
-				return nil, err
-			}
-			clientCert := make([]tls.Certificate, 0, 1)
-			clientCert = append(clientCert, certs)
-
-			tlsConfig.Certificates = clientCert
-		}
-
-		mysql.RegisterTLSConfig(datasource.Name, &tlsConfig)
 		cnnstr += "&tls=" + datasource.Name
 	}