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

Set tls ServerName to fix issue: either ServerName or InsecureSkipVerify must be specified in the tls.Config #1692

Merged
merged 2 commits into from
May 7, 2020
Merged

Set tls ServerName to fix issue: either ServerName or InsecureSkipVerify must be specified in the tls.Config #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab525ed
Set ServerName using tls.DialWithDialer approach
d1egoaz May 7, 2020
cb29302
Creates conf.Net.TLS.Config if not provided
d1egoaz May 7, 2020
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
17 changes: 16 additions & 1 deletion broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,22 @@ func (b *Broker) Open(conf *Config) error {

if conf.Net.TLS.Enable {
Logger.Printf("Using tls")
b.conn = tls.Client(b.conn, conf.Net.TLS.Config)
cfg := conf.Net.TLS.Config
if cfg == nil {
cfg = &tls.Config{}
}
// If no ServerName is set, infer the ServerName
// from the hostname we're connecting to.
// Gets the hostname as tls.DialWithDialer does it.
if cfg.ServerName == "" {
colonPos := strings.LastIndex(b.addr, ":")
if colonPos == -1 {
colonPos = len(b.addr)
}
hostname := b.addr[:colonPos]
cfg.ServerName = hostname
}
b.conn = tls.Client(b.conn, cfg)
}

b.conn = newBufConn(b.conn)
Expand Down
3 changes: 1 addition & 2 deletions client_tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ func TestTLS(t *testing.T) {
Succeed: true,
Server: serverTLSConfig,
Client: &tls.Config{
RootCAs: pool,
ServerName: "127.0.0.1",
RootCAs: pool,
Certificates: []tls.Certificate{{
Certificate: [][]byte{clientDer},
PrivateKey: clientkey,
Expand Down