status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build error introduced in bad merge of TLS stuff

This commit is contained in:
Paul Banks 2018-04-30 22:27:46 +01:00 committed by Mitchell Hashimoto
parent 67af5c740b
commit d1f4ad3d8a
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
connect/service.go
View File

@ -252,21 +252,7 @@ func (s *Service) rootsWatchHandler(blockParam watch.BlockingParamVal, raw inter
roots.AppendCertsFromPEM([]byte(root.RootCertPEM))
}
// Note that SetTLSConfig takes care of adding a dynamic GetConfigForClient
// hook that will fetch this updated config for new incoming connections on a
// server. That means all future connections are validated against the new
// roots. On a client, we only expose Dial and we fetch the most recent config
// each time so all future Dials (direct or via an http.Client with our dial
// hook) will grab this new config.
newCfg := s.serverTLSCfg.TLSConfig()
// Server-side verification uses ClientCAs.
newCfg.ClientCAs = roots
s.serverTLSCfg.SetTLSConfig(newCfg)
newCfg = s.clientTLSCfg.TLSConfig()
// Client-side verification uses RootCAs.
newCfg.RootCAs = roots
s.clientTLSCfg.SetTLSConfig(newCfg)
s.tlsCfg.SetRoots(roots)
}
func (s *Service) leafWatchHandler(blockParam watch.BlockingParamVal, raw interface{}) {
@ -286,16 +272,5 @@ func (s *Service) leafWatchHandler(blockParam watch.BlockingParamVal, raw interf
return
}
// Note that SetTLSConfig takes care of adding a dynamic GetClientCertificate
// hook that will fetch the first cert from the Certificates slice of the
// current config for each outbound client request even if the client is using
// an old version of the config struct so all we need to do it set that and
// all existing clients will start using the new cert.
newCfg := s.serverTLSCfg.TLSConfig()
newCfg.Certificates = []tls.Certificate{cert}
s.serverTLSCfg.SetTLSConfig(newCfg)
newCfg = s.clientTLSCfg.TLSConfig()
newCfg.Certificates = []tls.Certificate{cert}
s.clientTLSCfg.SetTLSConfig(newCfg)
s.tlsCfg.SetLeaf(&cert)
}