[ARVADOS] updated: 2.1.0-283-g7975d01ef

[Git user]

Summary of changes:
 lib/controller/rpc/conn.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

       via  7975d01ef884809f05f380b0e8f275ef0418808b (commit)
      from  dad86790c5f3edbcf38702542ba46cb7a9e7f42a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7975d01ef884809f05f380b0e8f275ef0418808b
Author: Tom Clegg <tom at curii.com>
Date:   Tue Jan 19 11:50:00 2021 -0500

    17170: Fix crash when http transport uses default nil transport.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 26f41e128..c9c0ac308 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

-----------------------------------------------------------------------


hooks/post-receive
--