luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent/consul: check nil on getCAProvider result

This commit is contained in:
Mitchell Hashimoto 2018-05-08 21:30:18 -07:00
parent c57405b323
commit 749f81373f
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/consul/connect_ca_endpoint.go
View File

@ -157,6 +157,9 @@ func (s *ConnectCA) ConfigurationSet(
// Have the old provider cross-sign the new intermediate
oldProvider := s.srv.getCAProvider()
if oldProvider == nil {
return fmt.Errorf("internal error: CA provider is nil")
}
xcCert, err := oldProvider.CrossSignCA(intermediateCA)
if err != nil {
return err
@ -283,6 +286,9 @@ func (s *ConnectCA) Sign(
}
provider := s.srv.getCAProvider()
if provider == nil {
return fmt.Errorf("internal error: CA provider is nil")
}
// todo(kyhavlov): more validation on the CSR before signing
pem, err := provider.Sign(csr)