From 3de491797278b13a626a8ee5e19379ab1a1ceaaa Mon Sep 17 00:00:00 2001 From: Matthieu Grieger Date: Fri, 1 Jul 2016 18:34:43 -0700 Subject: [PATCH] Potential fix for PEM IP SANs issue --- CHANGELOG.md | 3 +++ bot/mumbledj.go | 2 ++ main.go | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7329e20..6af5ab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ MumbleDJ Changelog ================== +### July 1, 2016 -- `v3.0.11` +* Potential fix for an issue with IP SANs on PEM certs. + ### June 29, 2016 -- `v3.0.10` * Fixed issue related to PEM keys being overwritten by PEM certs. diff --git a/bot/mumbledj.go b/bot/mumbledj.go index b28f799..0ff0c52 100644 --- a/bot/mumbledj.go +++ b/bot/mumbledj.go @@ -194,6 +194,8 @@ func (dj *MumbleDJ) Connect() error { if viper.GetBool("connection.insecure") { dj.TLSConfig.InsecureSkipVerify = true } + dj.TLSConfig.ServerName = viper.GetString("connection.address") + if viper.GetString("connection.cert") != "" { if viper.GetString("connection.key") == "" { viper.Set("connection.key", viper.GetString("connection.cert")) diff --git a/main.go b/main.go index 84d06b8..0c45fd5 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ func init() { services.DJ = DJ bot.DJ = DJ - DJ.Version = "v3.0.10" + DJ.Version = "v3.0.11" logrus.SetLevel(logrus.WarnLevel) }