Prevent go vet errors.

Author: moriyoshi

config.go

@@ -70,8 +70,8 @@ type PerHostConfig struct {
 }
 
 type MITMConfig struct {
-	ServerTLSConfigTemplate   tls.Config
-	ClientTLSConfigTemplate   tls.Config
+	ServerTLSConfigTemplate   *tls.Config
+	ClientTLSConfigTemplate   *tls.Config
 	SigningCertificateKeyPair struct {
 		Certificate *x509.Certificate
 		PrivateKey  crypto.PrivateKey
@@ -85,7 +85,7 @@ type ProxyConfig struct {
 	HTTPSProxy    *url.URL
 	IncludedHosts []HostPortPair
 	ExcludedHosts []HostPortPair
-	TLSConfig     tls.Config
+	TLSConfig     *tls.Config
 }
 
 type Config struct {
@@ -348,6 +348,8 @@ func (ctx *ConfigReaderContext) extractProxyConfig(configMap map[string]interfac
 			if err != nil {
 				return
 			}
+		} else {
+			retval.TLSConfig = new(tls.Config)
 		}
 	}
 	envUsed := false
@@ -689,7 +691,8 @@ func (ctx *ConfigReaderContext) extractCertPrivateKeyPairs(certConfigMap map[int
 	return
 }
 
-func (ctx *ConfigReaderContext) extractTLSConfig(tlsConfigMap map[interface{}]interface{}, path string, client bool) (retval tls.Config, err error) {
+func (ctx *ConfigReaderContext) extractTLSConfig(tlsConfigMap map[interface{}]interface{}, path string, client bool) (retval *tls.Config, err error) {
+	retval = new(tls.Config)
 	_cipherSuites, ok := tlsConfigMap["ciphers"]
 	if ok {
 		cipherSuites, ok := _cipherSuites.([]interface{})
@@ -848,6 +851,8 @@ func (ctx *ConfigReaderContext) extractMITMConfig(configMap map[string]interface
 			if err != nil {
 				return
 			}
+		} else {
+			retval.ClientTLSConfigTemplate = new(tls.Config)
 		}
 		__server, ok := _tls["server"]
 		if ok {
@@ -860,6 +865,8 @@ func (ctx *ConfigReaderContext) extractMITMConfig(configMap map[string]interface
 			if err != nil {
 				return
 			}
+		} else {
+			retval.ServerTLSConfigTemplate = new(tls.Config)
 		}
 		__ca, ok := _tls["ca"]
 		if !ok {

httpx/transport.go

@@ -780,14 +780,14 @@ func (t *Transport) DoDial(cm ConnectMethod) (conn net.Conn, isProxy bool, err e
 			return nil, false, err
 		}
 	} else {
-		proxyTLSConfigTemlate := cm.ProxyTLSConfig
+		proxyTLSConfigTemplate := cm.ProxyTLSConfig
 		tlsProxy := cm.ProxyURL != nil && cm.ProxyURL.Scheme == "https"
 		if tlsProxy {
-			if proxyTLSConfigTemlate == nil {
+			if proxyTLSConfigTemplate == nil {
 				if t.DialTLS != nil {
 					conn, err = t.DialTLS("tcp", cm.addr())
 				} else {
-					proxyTLSConfigTemlate = t.TLSClientConfig
+					proxyTLSConfigTemplate = t.TLSClientConfig
 				}
 			}
 		}
@@ -800,8 +800,10 @@ func (t *Transport) DoDial(cm ConnectMethod) (conn net.Conn, isProxy bool, err e
 				return nil, false, err
 			}
 			if tlsProxy {
-				proxyTLSConfig := new(tls.Config)
-				*proxyTLSConfig = *proxyTLSConfigTemlate
+				if proxyTLSConfigTemplate == nil {
+					return nil, false, fmt.Errorf("http: no client TLS configuration template is available")
+				}
+				proxyTLSConfig := proxyTLSConfigTemplate.Clone()
 				host, _, err := net.SplitHostPort(cm.ProxyURL.Host)
 				if err == nil {
 					proxyTLSConfig.ServerName = host

main.go

@@ -142,13 +142,13 @@ func (ctx *DevProxy) getProxyUrlForRequest(req *http.Request) (*url.URL, *tls.Co
 	}
 	if req.URL.Scheme == "https" {
 		if ctx.Config.Proxy.HTTPSProxy != nil {
-			return ctx.Config.Proxy.HTTPSProxy, &ctx.Config.Proxy.TLSConfig, nil
+			return ctx.Config.Proxy.HTTPSProxy, ctx.Config.Proxy.TLSConfig, nil
 		}
 	}
 	// falls back to http
 	if req.URL.Scheme == "https" || req.URL.Scheme == "http" {
 		if ctx.Config.Proxy.HTTPProxy != nil {
-			return ctx.Config.Proxy.HTTPProxy, &ctx.Config.Proxy.TLSConfig, nil
+			return ctx.Config.Proxy.HTTPProxy, ctx.Config.Proxy.TLSConfig, nil
 		}
 	}
 	return nil, nil, nil
@@ -160,14 +160,17 @@ func (ctx *DevProxy) newTLSConfigFactory() TLSConfigFactory {
 	}
 	return func(hostPortPairStr string, proxyCtx *OurProxyCtx) (*tls.Config, error) {
 		pair := splitHostPort(hostPortPairStr)
-		config := ctx.Config.MITM.ServerTLSConfigTemplate
+		if ctx.Config.MITM.ServerTLSConfigTemplate == nil {
+			return nil, errors.Errorf("no TLS configuration template is available")
+		}
+		config := ctx.Config.MITM.ServerTLSConfigTemplate.Clone()
 		ctx.Logger.Infof("Obtaining temporary certificate for %s", pair.Host)
 		cert, err := ctx.prepareMITMCertificate([]string{pair.Host})
 		if err != nil {
 			return nil, errors.Wrapf(err, "cannot sign host certificate with provided CA")
 		}
 		config.Certificates = append(config.Certificates, *cert)
-		return &config, nil
+		return config, nil
 	}
 }
 
@@ -179,7 +182,7 @@ func (ctx *DevProxy) newProxyURLBuilder() func(*http.Request) (*url.URL, *tls.Co
 
 func (ctx *DevProxy) newHttpTransport() *httpx.Transport {
 	transport := &httpx.Transport{
-		TLSClientConfig: &ctx.Config.MITM.ClientTLSConfigTemplate,
+		TLSClientConfig: ctx.Config.MITM.ClientTLSConfigTemplate,
 		Proxy2:          ctx.newProxyURLBuilder(),
 	}
 	transport.RegisterProtocol("fastcgi", &fastCGIRoundTripper{Logger: ctx.Logger})

server.go

@@ -294,7 +294,7 @@ func (proxyCtx *OurProxyCtx) DoRequest(req *http.Request, respW http.ResponseWri
 
 	if isWebSocketReq(req) {
 		proxyCtx.Logger.Debugf("Handling WebSocket Handshake: %v", req.URL)
-		cm, err := proxyCtx.Tr.ConnectMethodForRequest(&httpx.TransportRequest{req, nil})
+		cm, err := proxyCtx.Tr.ConnectMethodForRequest(&httpx.TransportRequest{Request: req, Extra: nil})
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to create a ConnectMethod struct")
 		}
@@ -580,8 +580,7 @@ func (proxy *OurProxyHttpServer) doDialTLS(addr HostPortPair, tlsConfigTemplate
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to connect to %v", addr)
 	}
-	tlsConfig := new(tls.Config)
-	*tlsConfig = *tlsConfigTemplate
+	tlsConfig := tlsConfigTemplate.Clone()
 	tlsConfig.ServerName = addr.Host
 	return tls.Client(conn, tlsConfig), nil
 }