17170: Don't reuse transport that might have http2 enabled.
authorTom Clegg <tom@curii.com>
Wed, 13 Jan 2021 22:06:57 +0000 (17:06 -0500)
committerTom Clegg <tom@curii.com>
Wed, 13 Jan 2021 22:06:57 +0000 (17:06 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

lib/controller/rpc/conn.go

index 7dd89452bec7fbeff1ca0c70cdbd3b8e24eaa914..48e67e2742717eb0f53f8616196730763e6f67c8 100644 (file)
@@ -298,8 +298,9 @@ 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, conn.httpClient.Transport.(*http.Transport).TLSClientConfig)
+       netconn, err := tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify: conn.httpClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify})
        if err != nil {
+               err = fmt.Errorf("tls.Dial: %w", err)
                return
        }
        defer func() {