Do not explicitly set `tls.Config.ServerName` in `HTTPGetter.httpClient()` func.

Signed-off-by: Wahab Ali <wahabalimk@gmail.com>
pull/9319/head
Wahab Ali 5 years ago
parent 4ec0a6c112
commit 37c529efeb

@ -24,7 +24,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"helm.sh/helm/v3/internal/tlsutil" "helm.sh/helm/v3/internal/tlsutil"
"helm.sh/helm/v3/internal/urlutil"
"helm.sh/helm/v3/internal/version" "helm.sh/helm/v3/internal/version"
) )
@ -99,13 +98,6 @@ func (g *HTTPGetter) httpClient() (*http.Client, error) {
if err != nil { if err != nil {
return nil, errors.Wrap(err, "can't create TLS config for client") 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 transport.TLSClientConfig = tlsConf
} }

@ -319,9 +319,6 @@ func TestHttpClientInsecureSkipVerify(t *testing.T) {
if len(transport.TLSClientConfig.Certificates) <= 0 { if len(transport.TLSClientConfig.Certificates) <= 0 {
t.Fatal("transport.TLSClientConfig.Certificates is not present") 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 { func verifyInsecureSkipVerify(t *testing.T, g HTTPGetter, caseName string, expectedValue bool) *http.Transport {

Loading…
Cancel
Save