From fc498642315270cc56368e996f91db676ecc0225 Mon Sep 17 00:00:00 2001
From: Arjan Bal <arjansbal@google.com>
Date: Mon, 19 Aug 2024 15:57:31 +0530
Subject: [PATCH] Add ALPN fields in fake test server and client

---
 credentials/credentials_test.go    | 10 ++++++++--
 credentials/xds/xds_client_test.go |  5 ++++-
 credentials/xds/xds_server_test.go |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/credentials/credentials_test.go b/credentials/credentials_test.go
index 08eb9c430ffc..41daaf3f004d 100644
--- a/credentials/credentials_test.go
+++ b/credentials/credentials_test.go
@@ -297,7 +297,10 @@ func tlsServerHandshake(conn net.Conn) (AuthInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	serverTLSConfig := &tls.Config{Certificates: []tls.Certificate{cert}}
+	serverTLSConfig := &tls.Config{
+		Certificates: []tls.Certificate{cert},
+		NextProtos:   []string{"h2"},
+	}
 	serverConn := tls.Server(conn, serverTLSConfig)
 	err = serverConn.Handshake()
 	if err != nil {
@@ -307,7 +310,10 @@ func tlsServerHandshake(conn net.Conn) (AuthInfo, error) {
 }
 
 func tlsClientHandshake(conn net.Conn, _ string) (AuthInfo, error) {
-	clientTLSConfig := &tls.Config{InsecureSkipVerify: true}
+	clientTLSConfig := &tls.Config{
+		InsecureSkipVerify: true,
+		NextProtos:         []string{"h2"},
+	}
 	clientConn := tls.Client(conn, clientTLSConfig)
 	if err := clientConn.Handshake(); err != nil {
 		return nil, err
diff --git a/credentials/xds/xds_client_test.go b/credentials/xds/xds_client_test.go
index cce40fc46f3a..54bb5960a0c7 100644
--- a/credentials/xds/xds_client_test.go
+++ b/credentials/xds/xds_client_test.go
@@ -146,7 +146,10 @@ func testServerTLSHandshake(rawConn net.Conn) handshakeResult {
 	if err != nil {
 		return handshakeResult{err: err}
 	}
-	cfg := &tls.Config{Certificates: []tls.Certificate{cert}}
+	cfg := &tls.Config{
+		Certificates: []tls.Certificate{cert},
+		NextProtos:   []string{"h2"},
+	}
 	conn := tls.Server(rawConn, cfg)
 	if err := conn.Handshake(); err != nil {
 		return handshakeResult{err: err}
diff --git a/credentials/xds/xds_server_test.go b/credentials/xds/xds_server_test.go
index dd3d83aab899..4547cf33b3d3 100644
--- a/credentials/xds/xds_server_test.go
+++ b/credentials/xds/xds_server_test.go
@@ -66,6 +66,7 @@ func makeClientTLSConfig(t *testing.T, mTLS bool) *tls.Config {
 		// verification function. So, the server credentials tests will rely
 		// solely on the success/failure of the server-side handshake.
 		InsecureSkipVerify: true,
+		NextProtos:         []string{"h2"},
 	}
 }