From 37c529efeb8b8f770f1727a3d0ea0aefff8adae4 Mon Sep 17 00:00:00 2001 From: Wahab Ali Date: Thu, 4 Feb 2021 06:27:25 +0500 Subject: [PATCH] Do not explicitly set `tls.Config.ServerName` in `HTTPGetter.httpClient()` func. Signed-off-by: Wahab Ali --- pkg/getter/httpgetter.go | 8 -------- pkg/getter/httpgetter_test.go | 3 --- 2 files changed, 11 deletions(-) diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go index bd60629ae..f66040a86 100644 --- a/pkg/getter/httpgetter.go +++ b/pkg/getter/httpgetter.go @@ -24,7 +24,6 @@ import ( "github.com/pkg/errors" "helm.sh/helm/v3/internal/tlsutil" - "helm.sh/helm/v3/internal/urlutil" "helm.sh/helm/v3/internal/version" ) @@ -99,13 +98,6 @@ func (g *HTTPGetter) httpClient() (*http.Client, error) { if err != nil { return nil, errors.Wrap(err, "can't create TLS config for client") } - tlsConf.BuildNameToCertificate() - - sni, err := urlutil.ExtractHostname(g.opts.url) - if err != nil { - return nil, err - } - tlsConf.ServerName = sni transport.TLSClientConfig = tlsConf } diff --git a/pkg/getter/httpgetter_test.go b/pkg/getter/httpgetter_test.go index 3aab22abe..e43edfa10 100644 --- a/pkg/getter/httpgetter_test.go +++ b/pkg/getter/httpgetter_test.go @@ -319,9 +319,6 @@ func TestHttpClientInsecureSkipVerify(t *testing.T) { if len(transport.TLSClientConfig.Certificates) <= 0 { t.Fatal("transport.TLSClientConfig.Certificates is not present") } - if transport.TLSClientConfig.ServerName == "" { - t.Fatal("TLSClientConfig.ServerName is blank") - } } func verifyInsecureSkipVerify(t *testing.T, g HTTPGetter, caseName string, expectedValue bool) *http.Transport {