From: Tom Clegg <tom@curii.com>
Date: Tue, 19 Jan 2021 16:50:00 +0000 (-0500)
Subject: 17170: Fix crash when http transport uses default nil transport.
X-Git-Tag: 2.2.0~135^2~15
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7975d01ef884809f05f380b0e8f275ef0418808b

17170: Fix crash when http transport uses default nil transport.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 26f41e1286..c9c0ac308c 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -298,7 +298,11 @@ func (conn *Conn) ContainerSSH(ctx context.Context, options arvados.ContainerSSH
 		// hostname or ::1 or 1::1
 		addr = net.JoinHostPort(addr, "https")
 	}
-	netconn, err := tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify: conn.httpClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify})
+	insecure := false
+	if tlsconf := conn.httpClient.Transport.(*http.Transport).TLSClientConfig; tlsconf != nil && tlsconf.InsecureSkipVerify {
+		insecure = true
+	}
+	netconn, err := tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify: insecure})
 	if err != nil {
 		err = fmt.Errorf("tls.Dial: %w", err)
 		return