Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.6] backport update tls configuration #3278

Merged
merged 1 commit into from
Feb 4, 2020
Merged

[7.6] backport update tls configuration #3278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions elasticsearch/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,12 @@ func (h Hosts) Validate() error {
}

func connectionConfig(config *Config) (*http.Transport, []string, error) {
var dial, tlsDial transport.Dialer
var addrs []string
proxy, err := httpProxyURL(config)
if err == nil {
addrs, err = addresses(config)
}
if err == nil {
dial, tlsDial, err = dialer(config)
}
transport := &http.Transport{
Proxy: proxy,
Dial: dial.Dial,
DialTLS: tlsDial.Dial,
addrs, err := addresses(config)
if err != nil {
return nil, nil, err
}
return transport, addrs, err
transp, err := httpTransport(config)
return transp, addrs, err
}

func httpProxyURL(cfg *Config) (func(*http.Request) (*url.URL, error), error) {
Expand Down Expand Up @@ -122,16 +113,27 @@ func addresses(cfg *Config) ([]string, error) {
return addresses, nil
}

func dialer(cfg *Config) (transport.Dialer, transport.Dialer, error) {
func httpTransport(cfg *Config) (*http.Transport, error) {
proxy, err := httpProxyURL(cfg)
if err != nil {
return nil, err
}

var tlsConfig *tlscommon.TLSConfig
var err error
if cfg.TLS.IsEnabled() {
if tlsConfig, err = tlscommon.LoadTLSConfig(cfg.TLS); err != nil {
return nil, nil, err
return nil, err
}
}

dialer := transport.NetDialer(cfg.Timeout)
tlsDialer, err := transport.TLSDialer(dialer, tlsConfig, cfg.Timeout)
return dialer, tlsDialer, err
if err != nil {
return nil, err
}
return &http.Transport{
Proxy: proxy,
Dial: dialer.Dial,
DialTLS: tlsDialer.Dial,
TLSClientConfig: tlsConfig.ToConfig(),
}, nil
}