From a4893d527171938a4f90d4520e8db97d972f608c Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Thu, 14 Nov 2019 07:36:30 -0800 Subject: [PATCH] Check error return from closing connection Kubernetes-commit: 7bafa7d8f54326b69d41c92793eaa641d3a5b31b --- util/cert/server_inspection.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/util/cert/server_inspection.go b/util/cert/server_inspection.go index 0fef8811..f1ef292d 100644 --- a/util/cert/server_inspection.go +++ b/util/cert/server_inspection.go @@ -19,6 +19,7 @@ package cert import ( "crypto/tls" "crypto/x509" + "fmt" "net/url" "strings" ) @@ -43,7 +44,9 @@ func GetClientCANames(apiHost string) ([]string, error) { if err != nil { return nil, err } - defer conn.Close() + if err := conn.Close(); err != nil { + return nil, err + } return acceptableCAs, nil } @@ -72,7 +75,9 @@ func GetServingCertificates(apiHost, serverName string) ([]*x509.Certificate, [] if err != nil { return nil, nil, err } - conn.Close() + if err = conn.Close(); err != nil { + return nil, nil, fmt.Errorf("failed to close connection : %v", err) + } peerCerts := conn.ConnectionState().PeerCertificates peerCertBytes := [][]byte{}