[OOM-K8S-CERT-EXTERNAL-PROVIDER] Format golang code

[oom/platform/cert-service.git] / certServiceK8sExternalProvider / src / cmpv2provisioner / cmpv2_provisioner.go

diff --git a/certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner.go b/certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner.go
index c0304d7..ee65b3c 100644 (file)
--- a/certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner.go
+++ b/certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner.go
@@ -26,19 +26,16 @@
 package cmpv2provisioner
 
 import (
-       "bytes"
        "context"
-       "crypto/x509"
-       "encoding/pem"
-       "fmt"
        "sync"
 
        certmanager "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
        "k8s.io/apimachinery/pkg/types"
-       ctrl "sigs.k8s.io/controller-runtime"
 
        "onap.org/oom-certservice/k8s-external-provider/src/certserviceclient"
        "onap.org/oom-certservice/k8s-external-provider/src/cmpv2api"
+       "onap.org/oom-certservice/k8s-external-provider/src/cmpv2provisioner/csr"
+       "onap.org/oom-certservice/k8s-external-provider/src/leveledlogger"
 )
 
 var collection = new(sync.Map)
@@ -62,14 +59,14 @@ func New(cmpv2Issuer *cmpv2api.CMPv2Issuer, certServiceClient certserviceclient.
        ca.certEndpoint = cmpv2Issuer.Spec.CertEndpoint
        ca.certServiceClient = certServiceClient
 
-       log := ctrl.Log.WithName("cmpv2-provisioner")
+       log := leveledlogger.GetLoggerWithName("cmpv2-provisioner")
        log.Info("Configuring CA: ", "name", ca.name, "url", ca.url, "caName", ca.caName, "healthEndpoint", ca.healthEndpoint, "certEndpoint", ca.certEndpoint)
 
        return &ca, nil
 }
 
 func (ca *CertServiceCA) CheckHealth() error {
-       log := ctrl.Log.WithName("cmpv2-provisioner")
+       log := leveledlogger.GetLoggerWithName("cmpv2-provisioner")
        log.Info("Checking health of CMPv2 issuer: ", "name", ca.name)
        return ca.certServiceClient.CheckHealth()
 }
@@ -87,73 +84,45 @@ func Store(namespacedName types.NamespacedName, provisioner *CertServiceCA) {
        collection.Store(namespacedName, provisioner)
 }
 
-func (ca *CertServiceCA) Sign(ctx context.Context, certificateRequest *certmanager.CertificateRequest, privateKeyBytes []byte) ([]byte, []byte, error) {
-       log := ctrl.Log.WithName("certservice-provisioner")
+func (ca *CertServiceCA) Sign(
+       ctx context.Context,
+       certificateRequest *certmanager.CertificateRequest,
+       privateKeyBytes []byte,
+) (signedCertificateChain []byte, trustedCertificates []byte, err error) {
+       log := leveledlogger.GetLoggerWithName("certservice-provisioner")
        log.Info("Signing certificate: ", "cert-name", certificateRequest.Name)
 
        log.Info("CA: ", "name", ca.name, "url", ca.url)
 
        csrBytes := certificateRequest.Spec.Request
-       log.Info("Csr PEM: ", "bytes", csrBytes)
+       log.Debug("Original CSR PEM: ", "bytes", csrBytes)
 
-       csr, err := decodeCSR(csrBytes)
+       filteredCsrBytes, err := csr.FilterFieldsFromCSR(csrBytes, privateKeyBytes)
        if err != nil {
                return nil, nil, err
        }
+       log.Debug("Filtered out CSR PEM: ", "bytes", filteredCsrBytes)
 
-       response, err := ca.certServiceClient.GetCertificates(csrBytes, privateKeyBytes)
+       response, err := ca.certServiceClient.GetCertificates(filteredCsrBytes, privateKeyBytes)
        if err != nil {
                return nil, nil, err
        }
-       log.Info("Certificate Chain", "cert-chain", response.CertificateChain)
-       log.Info("Trusted Certificates", "trust-certs", response.TrustedCertificates)
+       log.Info("Successfully received response from CertService API")
+       log.Debug("Certificate Chain", "cert-chain", response.CertificateChain)
+       log.Debug("Trusted Certificates", "trust-certs", response.TrustedCertificates)
 
+       log.Info("Start parsing response")
+       signedCertificateChain, trustedCertificates, signErr := parseResponseToBytes(response)
 
-       // TODO
-       // stored response as PEM
-       cert := x509.Certificate{}
-       cert.Raw = csr.Raw
-       encodedPEM, err := encodeX509(&cert)
-       if err != nil {
-               return nil, nil, err
+       if signErr != nil {
+               log.Error(signErr, "Cannot parse response from CertService API")
+               return nil, nil, signErr
        }
-       // END
 
-       signedPEM := encodedPEM
-       trustedCA := encodedPEM
-
-       log.Info("Signed cert PEM: ", "bytes", signedPEM)
-       log.Info("Trusted CA  PEM: ", "bytes", trustedCA)
        log.Info("Successfully signed: ", "cert-name", certificateRequest.Name)
 
-       return signedPEM, trustedCA, nil
-}
+       log.Debug("Signed cert PEM: ", "bytes", signedCertificateChain)
+       log.Debug("Trusted CA  PEM: ", "bytes", trustedCertificates)
 
-// decodeCSR decodes a certificate request in PEM format and returns the
-func decodeCSR(data []byte) (*x509.CertificateRequest, error) {
-       block, rest := pem.Decode(data)
-       if block == nil || len(rest) > 0 {
-               return nil, fmt.Errorf("unexpected CSR PEM on sign request")
-       }
-       if block.Type != "CERTIFICATE REQUEST" {
-               return nil, fmt.Errorf("PEM is not a certificate request")
-       }
-       csr, err := x509.ParseCertificateRequest(block.Bytes)
-       if err != nil {
-               return nil, fmt.Errorf("error parsing certificate request: %v", err)
-       }
-       if err := csr.CheckSignature(); err != nil {
-               return nil, fmt.Errorf("error checking certificate request signature: %v", err)
-       }
-       return csr, nil
-}
-
-// encodeX509 will encode a *x509.Certificate into PEM format.
-func encodeX509(cert *x509.Certificate) ([]byte, error) {
-       caPem := bytes.NewBuffer([]byte{})
-       err := pem.Encode(caPem, &pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw})
-       if err != nil {
-               return nil, err
-       }
-       return caPem.Bytes(), nil
+       return signedCertificateChain, trustedCertificates, nil
 }