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

fix nil pointer when ssl with ca.crt (#2331)

Browse source
This commit is contained in:
Oilbeater 2018-04-11 20:30:16 +08:00 committed by Manuel Alejandro de Brito Fontes
parent 156bc7a177
commit 17f6996941
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/net/ssl/ssl.go
View file

@ -265,7 +265,7 @@ func AddCertAuth(name string, ca []byte, fs file.Filesystem) (*ingress.SSLCert,
return nil, fmt.Errorf("CA file %v contains invalid data, and must be created only with PEM formatted certificates", name) return nil, fmt.Errorf("CA file %v contains invalid data, and must be created only with PEM formatted certificates", name)
} }
_, err := x509.ParseCertificate(pemCABlock.Bytes) pemCert, err := x509.ParseCertificate(pemCABlock.Bytes)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -283,6 +283,7 @@ func AddCertAuth(name string, ca []byte, fs file.Filesystem) (*ingress.SSLCert,
glog.V(3).Infof("Created CA Certificate for Authentication: %v", caFileName) glog.V(3).Infof("Created CA Certificate for Authentication: %v", caFileName)
return &ingress.SSLCert{ return &ingress.SSLCert{
Certificate: pemCert,
CAFileName: caFileName, CAFileName: caFileName,
PemFileName: caFileName, PemFileName: caFileName,
PemSHA: file.SHA1(caFileName), PemSHA: file.SHA1(caFileName),