Skip to content

Commit

Permalink
Merge pull request kubernetes#110029 from ash2k/ash2k/no-double-tls-v…
Browse files Browse the repository at this point in the history
…alidation

tls.Dial() validates hostname, no need to do that manually
  • Loading branch information
k8s-ci-robot committed May 16, 2022
2 parents 4584404 + 29dc50c commit 81261d4
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions staging/src/k8s.io/apimachinery/pkg/util/proxy/dial.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ import (
"net/http"
"net/url"

"k8s.io/klog/v2"

utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/third_party/forked/golang/netutil"
"k8s.io/klog/v2"
)

// dialURL will dial the specified URL using the underlying dialer held by the passed
Expand Down Expand Up @@ -109,21 +108,6 @@ func dialURL(ctx context.Context, url *url.URL, transport http.RoundTripper) (ne
}
}

// Return if we were configured to skip validation
if tlsConfig != nil && tlsConfig.InsecureSkipVerify {
return tlsConn, nil
}

// Verify
host, _, _ := net.SplitHostPort(dialAddr)
if tlsConfig != nil && len(tlsConfig.ServerName) > 0 {
host = tlsConfig.ServerName
}
if err := tlsConn.VerifyHostname(host); err != nil {
tlsConn.Close()
return nil, err
}

return tlsConn, nil
default:
return nil, fmt.Errorf("Unknown scheme: %s", url.Scheme)
Expand Down

0 comments on commit 81261d4

Please sign in to comment.