Skip to content

Commit fe293da

Browse files
authored
Decode pem before parsing certificate (#1006)
1 parent 8b72388 commit fe293da

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

pkg/util/certificates.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,11 @@ func (cf *CertificateFactory) UserCert(principal *models.Principal, apiURL strin
396396
func loadOrCreateCA(kluster *v1.Kluster, name string, cert, key *string, certUpdates *[]CertUpdates) (*Bundle, error) {
397397
regenerate := false
398398
if name == "TLS" && *cert != "" {
399-
caCert, err := x509.ParseCertificate([]byte(*cert))
399+
block, _ := pem.Decode([]byte(*cert))
400+
if block == nil {
401+
return nil, fmt.Errorf("Failed to decode TLS CA certificate")
402+
}
403+
caCert, err := x509.ParseCertificate(block.Bytes)
400404
if err != nil {
401405
return nil, fmt.Errorf("Failed to parse TLS CA certificate: %s", err)
402406
}

0 commit comments

Comments
 (0)