From b247e082475e1bdae4cd8d56aa8386a9164fe213 Mon Sep 17 00:00:00 2001 From: Maxim Pogozhiy Date: Fri, 3 Nov 2017 12:45:08 +0300 Subject: [PATCH] Fixes in bundle.pem --- pkg/cfssl/cfssl.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cfssl/cfssl.go b/pkg/cfssl/cfssl.go index da328ac..70a9693 100644 --- a/pkg/cfssl/cfssl.go +++ b/pkg/cfssl/cfssl.go @@ -37,8 +37,8 @@ func New(kubecfssl kubecfssl.KubeCfssl) *Cfssl { func (c *Cfssl) getBundle() { c.certificateData[kubecfssl.BundleCertificateName] = []byte(string(string(c.certificateData[kubecfssl.CertificateName]) + - string(c.certificateData[kubecfssl.RootCertificateName]) + - string(c.certificateData[kubecfssl.CertificateKeyName]))) + string(c.certificateData[kubecfssl.RootCertificateName]) + "\n" + + string(c.certificateData[kubecfssl.CertificateKeyName]))) } func (c *Cfssl) GetCertificate(pkiURL string, authKey string, csrConfig string) map[string][]byte { @@ -58,7 +58,6 @@ func (c *Cfssl) certificateRequest (pkiURL string, authKey string,csrConfig stri client := &http.Client{} resp, err := client.Do(req) c.checkError(err) - defer resp.Body.Close() return resp } @@ -136,7 +135,6 @@ func (c *Cfssl) constructAuthRequest(key string, request []byte) string { reqJson, _ := json.Marshal(reqData) jsonStr := string(reqJson) c.Log().Infoln("Processing certificate request") - c.Log().Debugln("JSON Request: ", string(jsonStr)) return jsonStr } @@ -149,8 +147,10 @@ func (c *Cfssl) ComputeHmac256(message []byte, secret string) string { } func (c *Cfssl) getCRT(resp *http.Response) []byte { + if resp.StatusCode == 200 { body, _ := ioutil.ReadAll(resp.Body) + var response Response json.Unmarshal([]byte(body), &response) c.Log().Infoln("Certificate generation complete")