Fix: leader_tls_servername raft option only worked when used with mTL…

…S and/or an explicit CA cert. (#11252)
hashicorp · Apr 6, 2021 · 0dff055 · 0dff055
1 parent 04dec91
commit 0dff055
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/vault/raft.go b/vault/raft.go
@@ -806,6 +806,12 @@ func (c *Core) JoinRaftCluster(ctx context.Context, leaderInfos []*raft.LeaderJo
 				}
 				leaderInfo.TLSConfig.ServerName = leaderInfo.LeaderTLSServerName
 			}
+			if leaderInfo.TLSConfig == nil && leaderInfo.LeaderTLSServerName != "" {
+				leaderInfo.TLSConfig, err = tlsutil.SetupTLSConfig(map[string]string{"address": leaderInfo.LeaderTLSServerName}, "")
+				if err != nil {
+					return errwrap.Wrapf("failed to create TLS config: {{err}}", err)
+				}
+			}
 
 			if leaderInfo.TLSConfig != nil {
 				transport.TLSClientConfig = leaderInfo.TLSConfig.Clone()