DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Temporary PEM Files cleanup

Browse source
This commit is contained in:
Ricardo Pchevuzinske Katz 2017-03-06 16:33:44 -03:00
parent 51235a38e8
commit e107e2b87f
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/pkg/net/ssl/ssl.go
View file

@ -68,11 +68,13 @@ func AddOrUpdateCertAndKey(name string, cert, key, ca []byte) (*ingress.SSLCert,
pemCerts, err := ioutil.ReadFile(tempPemFile.Name()) pemCerts, err := ioutil.ReadFile(tempPemFile.Name())
if err != nil { if err != nil {
_ = os.Remove(tempPemFile.Name())
return nil, err return nil, err
} }
pemBlock, _ := pem.Decode(pemCerts) pemBlock, _ := pem.Decode(pemCerts)
if pemBlock == nil { if pemBlock == nil {
_ = os.Remove(tempPemFile.Name())
return nil, fmt.Errorf("No valid PEM formatted block found") return nil, fmt.Errorf("No valid PEM formatted block found")
} }
@ -84,6 +86,7 @@ func AddOrUpdateCertAndKey(name string, cert, key, ca []byte) (*ingress.SSLCert,
pemCert, err := x509.ParseCertificate(pemBlock.Bytes) pemCert, err := x509.ParseCertificate(pemBlock.Bytes)
if err != nil { if err != nil {
_ = os.Remove(tempPemFile.Name())
return nil, err return nil, err
} }