github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(ssl): improve caching behavior BE-11527 (#273)

pull/11388/head
andres-portainer 2024-12-30 11:10:13 -03:00 committed by GitHub
parent 0d52f9dd0e
commit 33ea22c0a9
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/internal/ssl/ssl.go
View File

@ -64,8 +64,7 @@ func (service *Service) Init(host, certPath, keyPath string) error {
// path not supplied and certificates doesn't exist - generate self-signed // path not supplied and certificates doesn't exist - generate self-signed
certPath, keyPath = service.fileService.GetDefaultSSLCertsPath() certPath, keyPath = service.fileService.GetDefaultSSLCertsPath()
err = generateSelfSignedCertificates(host, certPath, keyPath) if err := generateSelfSignedCertificates(host, certPath, keyPath); err != nil {
if err != nil {
return errors.Wrap(err, "failed generating self signed certs") return errors.Wrap(err, "failed generating self signed certs")
} }
@ -98,8 +97,7 @@ func (service *Service) SetCertificates(certData, keyData []byte) error {
return errors.New("missing certificate files") return errors.New("missing certificate files")
} }
_, err := tls.X509KeyPair(certData, keyData) if _, err := tls.X509KeyPair(certData, keyData); err != nil {
if err != nil {
return err return err
} }
@ -108,8 +106,7 @@ func (service *Service) SetCertificates(certData, keyData []byte) error {
return err return err
} }
err = service.cacheInfo(certPath, keyPath, false) if err := service.cacheInfo(certPath, keyPath, false); err != nil {
if err != nil {
return err return err
} }
@ -130,8 +127,7 @@ func (service *Service) SetHTTPEnabled(httpEnabled bool) error {
settings.HTTPEnabled = httpEnabled settings.HTTPEnabled = httpEnabled
err = service.dataStore.SSLSettings().UpdateSettings(settings) if err := service.dataStore.SSLSettings().UpdateSettings(settings); err != nil {
if err != nil {
return err return err
} }
@ -152,8 +148,7 @@ func (service *Service) cacheCertificate(certPath, keyPath string) error {
} }
func (service *Service) cacheInfo(certPath string, keyPath string, selfSigned bool) error { func (service *Service) cacheInfo(certPath string, keyPath string, selfSigned bool) error {
err := service.cacheCertificate(certPath, keyPath) if err := service.cacheCertificate(certPath, keyPath); err != nil {
if err != nil {
return err return err
} }