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

refactor to remove duplication

This commit is contained in:
Chelsea Holland Komlo 2018-05-29 18:44:30 -04:00
parent 35b5d0a30e
commit 498b57036d
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
helper/tlsutil/config.go
View File

@ -148,6 +148,27 @@ func (c *Config) AppendCA(pool *x509.CertPool) error {
}
block, rest := pem.Decode(data)
if err := validateCertificate(block); err != nil {
return err
}
for len(rest) > 0 {
block, rest = pem.Decode(rest)
if err := validateCertificate(block); err != nil {
return err
}
}
if !pool.AppendCertsFromPEM(data) {
return fmt.Errorf("Failed to add any CA certificates")
}
return nil
}
// validateCertificate checks to ensure a certificate is valid. If it is not,
// return a descriptive error of why the certificate is invalid.
func validateCertificate(block *pem.Block) error {
if block == nil {
return fmt.Errorf("Failed to decode CA file from pem format")
}
@ -157,31 +178,6 @@ func (c *Config) AppendCA(pool *x509.CertPool) error {
return fmt.Errorf("Failed to parse CA file: %v", err)
}
if !pool.AppendCertsFromPEM(data) {
return fmt.Errorf("Failed to add any CA certificates")
}
for len(rest) > 0 {
block, rest = pem.Decode(rest)
if block == nil {
return fmt.Errorf("Failed to decode CA file from pem format")
}
// Parse the certificate to ensure that it is properly formatted
if _, err := x509.ParseCertificates(block.Bytes); err != nil {
return fmt.Errorf("Failed to parse CA file: %v", err)
}
if !pool.AppendCertsFromPEM(data) {
return fmt.Errorf("Failed to add any CA certificates")
}
if len(rest) == 0 {
break
}
}
return nil
}