weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update CA issuer to log to Event Recorder

Browse Source
This commit is contained in:
James Munnelly 2017-09-11 00:25:17 +01:00
parent 9ba1a35fa1
commit 87df7a0d81
3 changed files with 95 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
pkg/issuer/ca/issue.go
View File

@ -10,51 +10,87 @@ import (
"math/big"
"time"
"github.com/golang/glog"
"github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1"
"github.com/jetstack-experimental/cert-manager/pkg/util/kube"
"github.com/jetstack-experimental/cert-manager/pkg/util/pki"
"k8s.io/api/core/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
)
const (
errorGetCertKeyPair = "ErrGetCertKeyPair"
errorIssueCert = "ErrIssueCert"
successCertIssued = "CertIssueSuccess"
messageErrorGetCertKeyPair = "Error getting keypair for certificate: "
messageErrorIssueCert = "Error issuing TLS certificate: "
messageCertIssued = "Certificate issued successfully"
)
const (
// certificateDuration of 1 year
certificateDuration = time.Hour * 24 * 365
defaultOrganization = "cert-manager"
)
func (c *CA) Issue(crt *v1alpha1.Certificate) ([]byte, []byte, error) {
signerCert, err := kube.SecretTLSCert(c.secretsLister, c.issuer.Namespace, c.issuer.Spec.CA.SecretRef.Name)
if err != nil {
return nil, nil, err
}
signerKey, err := kube.SecretTLSKey(c.secretsLister, c.issuer.Namespace, c.issuer.Spec.CA.SecretRef.Name)
if err != nil {
return nil, nil, err
}
func (c *CA) Issue(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, []byte, []byte, error) {
update := crt.DeepCopy()
signeeKey, err := kube.SecretTLSKey(c.secretsLister, c.issuer.Namespace, crt.Spec.SecretName)
if k8sErrors.IsNotFound(err) {
signeeKey, err = pki.GenerateRSAPrivateKey(2048)
if err != nil {
return nil, nil, fmt.Errorf("error generating private key: %s", err.Error())
}
}
if signeeKey == nil {
return nil, nil, fmt.Errorf("error getting certificate private key: %s", err.Error())
}
crtPem, _, err := signCertificate(crt, signerCert, &signeeKey.PublicKey, signerKey)
if err != nil {
return nil, nil, err
s := messageErrorGetCertKeyPair + err.Error()
glog.Info(s)
c.recorder.Event(update, v1.EventTypeWarning, errorGetCertKeyPair, s)
update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorGetCertKeyPair, s)
return update.Status, nil, nil, err
}
return pki.EncodePKCS1PrivateKey(signeeKey), crtPem, nil
certPem, err := c.obtainCertificate(crt, signeeKey)
if err != nil {
s := messageErrorIssueCert + err.Error()
glog.Info(s)
c.recorder.Event(update, v1.EventTypeWarning, errorIssueCert, s)
update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorIssueCert, s)
return update.Status, nil, nil, err
}
s := messageCertIssued
glog.Info(s)
c.recorder.Event(update, v1.EventTypeNormal, successCertIssued, s)
update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertIssued, s)
return update.Status, pki.EncodePKCS1PrivateKey(signeeKey), certPem, nil
}
func (c *CA) obtainCertificate(crt *v1alpha1.Certificate, signeeKey interface{}) ([]byte, error) {
signerCert, err := kube.SecretTLSCert(c.secretsLister, c.issuer.Namespace, c.issuer.Spec.CA.SecretRef.Name)
if err != nil {
return nil, fmt.Errorf("error getting issuer certificate: %s", err.Error())
}
signerKey, err := kube.SecretTLSKey(c.secretsLister, c.issuer.Namespace, c.issuer.Spec.CA.SecretRef.Name)
if err != nil {
return nil, fmt.Errorf("error getting issuer private key: %s", err.Error())
}
crtPem, _, err := signCertificate(crt, signerCert, signeeKey, signerKey)
if err != nil {
return nil, err
}
return crtPem, nil
}
func createCertificateTemplate(crt *v1alpha1.Certificate, publicKey interface{}) (*x509.Certificate, error) {
@ -90,25 +126,25 @@ func createCertificateTemplate(crt *v1alpha1.Certificate, publicKey interface{})
func signCertificate(crt *v1alpha1.Certificate, issuerCert *x509.Certificate, publicKey interface{}, signerKey interface{}) ([]byte, *x509.Certificate, error) {
template, err := createCertificateTemplate(crt, publicKey)
if err != nil {
return nil, nil, fmt.Errorf("Error creating x509 certificate template: %s", err.Error())
return nil, nil, fmt.Errorf("error creating x509 certificate template: %s", err.Error())
}
derBytes, err := x509.CreateCertificate(rand.Reader, template, issuerCert, publicKey, signerKey)
if err != nil {
return nil, nil, fmt.Errorf("Error creating x509 certificate: %s", err.Error())
return nil, nil, fmt.Errorf("error creating x509 certificate: %s", err.Error())
}
cert, err := pki.DecodeDERCertificateBytes(derBytes)
if err != nil {
return nil, nil, fmt.Errorf("Error decoding DER certificate bytes: %s", err.Error())
return nil, nil, fmt.Errorf("error decoding DER certificate bytes: %s", err.Error())
}
pemBytes := bytes.NewBuffer([]byte{})
err = pem.Encode(pemBytes, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
if err != nil {
return nil, nil, fmt.Errorf("Error encoding certificate PEM: %s", err.Error())
return nil, nil, fmt.Errorf("error encoding certificate PEM: %s", err.Error())
}
return pemBytes.Bytes(), cert, err
}

7
pkg/issuer/ca/prepare.go
View File

@ -2,8 +2,9 @@ package ca
import "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1"
// Prepare does nothing for the CA issuer. In future, this may validate
// the certificate request against the issuer, or set fields in the Status
// block to be consumed in Issue and Renew
func (c *CA) Prepare(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, error) {
updateStatus := *crt.Status.DeepCopy()
return updateStatus, nil
return crt.Status, nil
}

43
pkg/issuer/ca/renew.go
View File

@ -1,37 +1,50 @@
package ca
import (
"fmt"
"github.com/golang/glog"
"github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1"
"github.com/jetstack-experimental/cert-manager/pkg/util/kube"
"github.com/jetstack-experimental/cert-manager/pkg/util/pki"
"k8s.io/api/core/v1"
)
func (c *CA) Renew(crt *v1alpha1.Certificate) ([]byte, []byte, error) {
signerCert, err := kube.SecretTLSCert(c.secretsLister, c.issuer.Namespace, c.issuer.Spec.CA.SecretRef.Name)
const (
errorRenewCert = "ErrRenewCert"
if err != nil {
return nil, nil, err
}
successCertRenewed = "CertIssueSuccess"
signerKey, err := kube.SecretTLSKey(c.secretsLister, c.issuer.Namespace, c.issuer.Spec.CA.SecretRef.Name)
messageErrorRenewCert = "Error issuing TLS certificate: "
if err != nil {
return nil, nil, err
}
messageCertRenewed = "Certificate issued successfully"
)
func (c *CA) Renew(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, []byte, []byte, error) {
update := crt.DeepCopy()
signeeKey, err := kube.SecretTLSKey(c.secretsLister, c.issuer.Namespace, crt.Spec.SecretName)
if err != nil {
return nil, nil, fmt.Errorf("error getting certificate private key: %s", err.Error())
s := messageErrorGetCertKeyPair + err.Error()
glog.Info(s)
c.recorder.Event(update, v1.EventTypeWarning, errorGetCertKeyPair, s)
update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorGetCertKeyPair, s)
return update.Status, nil, nil, err
}
crtPem, _, err := signCertificate(crt, signerCert, &signeeKey.PublicKey, signerKey)
certPem, err := c.obtainCertificate(crt, signeeKey)
if err != nil {
return nil, nil, err
s := messageErrorRenewCert + err.Error()
glog.Info(s)
c.recorder.Event(update, v1.EventTypeWarning, errorRenewCert, s)
update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorRenewCert, s)
return update.Status, nil, nil, err
}
return pki.EncodePKCS1PrivateKey(signeeKey), crtPem, nil
s := messageCertRenewed
glog.Info(s)
c.recorder.Event(update, v1.EventTypeNormal, successCertRenewed, s)
update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertRenewed, s)
return update.Status, pki.EncodePKCS1PrivateKey(signeeKey), certPem, nil
}