Fix issue with tls and http2.

blakerouse · blakerouse · commit 248747d537fd · 2021-06-28T09:02:02.000-04:00
diff --git a/libbeat/common/transport/tls.go b/libbeat/common/transport/tls.go
@@ -93,13 +93,40 @@ func TestTLSDialerH2(
 	config *tlscommon.TLSConfig,
 	timeout time.Duration,
 ) (DialerH2, error) {
+	var lastTLSConfig *tls.Config
+	var lastNetwork string
+	var lastAddress string
+	var m sync.Mutex
+
 	return DialerFuncH2(func(network, address string, cfg *tls.Config) (net.Conn, error) {
 		switch network {
 		case "tcp", "tcp4", "tcp6":
 		default:
 			return nil, fmt.Errorf("unsupported network type %v", network)
 		}
-		return tlsDialWith(d, forward, network, address, timeout, cfg, config)
+
+		host, _, err := net.SplitHostPort(address)
+		if err != nil {
+			return nil, err
+		}
+
+		var tlsConfig *tls.Config
+		m.Lock()
+		if network == lastNetwork && address == lastAddress {
+			tlsConfig = lastTLSConfig
+		}
+		if tlsConfig == nil {
+			tlsConfig = config.BuildModuleClientConfig(host)
+			lastNetwork = network
+			lastAddress = address
+			lastTLSConfig = tlsConfig
+		}
+		m.Unlock()
+
+		// NextProtos must be set from the passed h2 connection or it will fail
+		tlsConfig.NextProtos = cfg.NextProtos
+
+		return tlsDialWith(d, forward, network, address, timeout, tlsConfig, config)
 	}), nil
 }
 
