Merge pull request #1344 from akatashev/ssl_support_for_reverse_proxy

Use RaftHttpTransport for reverse-proxy

go/http/raft_reverse_proxy.go

@@ -44,5 +44,10 @@ func raftReverseProxy(w http.ResponseWriter, r *http.Request, c martini.Context)
 		r.SetBasicAuth(config.Config.HTTPAuthUser, config.Config.HTTPAuthPassword)
 	}
 	proxy := httputil.NewSingleHostReverseProxy(url)
+	proxy.Transport, err = orcraft.GetRaftHttpTransport()
+	if err != nil {
+		log.Errore(err)
+		return
+	}
 	proxy.ServeHTTP(w, r)
 }

go/raft/http_client.go

@@ -31,9 +31,16 @@ import (
 	"github.com/openark/golib/log"
 )
 
-var httpClient *http.Client
+var (
+	httpClient    *http.Client
+	httpTransport *http.Transport
+)
 
-func setupHttpClient() error {
+func GetRaftHttpTransport() (*http.Transport, error) {
+	// Checks whether there is a cached httpTransport to return:
+	if httpTransport != nil {
+		return httpTransport, nil
+	}
 	httpTimeout := time.Duration(config.ActiveNodeExpireSeconds) * time.Second
 	dialTimeout := func(network, addr string) (net.Conn, error) {
 		return net.DialTimeout(network, addr, httpTimeout)
@@ -45,7 +52,7 @@ func setupHttpClient() error {
 	if config.Config.UseSSL {
 		caPool, err := ssl.ReadCAFile(config.Config.SSLCAFile)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		tlsConfig.RootCAs = caPool
 
@@ -55,16 +62,25 @@ func setupHttpClient() error {
 				sslPEMPassword = ssl.GetPEMPassword(config.Config.SSLPrivateKeyFile)
 			}
 			if err := ssl.AppendKeyPairWithPassword(tlsConfig, config.Config.SSLCertFile, config.Config.SSLPrivateKeyFile, sslPEMPassword); err != nil {
-				return err
+				return nil, err
 			}
 		}
 	}
 
-	httpTransport := &http.Transport{
+	transport := &http.Transport{
 		TLSClientConfig:       tlsConfig,
 		Dial:                  dialTimeout,
 		ResponseHeaderTimeout: httpTimeout,
 	}
+	return transport, nil
+}
+
+func setupHttpClient() error {
+	transport, err := GetRaftHttpTransport()
+	if err != nil {
+		return err
+	}
+	httpTransport = transport
 	httpClient = &http.Client{Transport: httpTransport}
 
 	return nil