baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: acme panic

Browse source
This commit is contained in:
Ludovic Fernandez 2022-09-23 10:42:09 +02:00 committed by GitHub
parent c4cc30ccc6
commit bb66950197
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkg/provider/acme/provider.go
View file

@ -397,7 +397,7 @@ func (p *Provider) resolveDomains(ctx context.Context, domains []string, tlsStor
return return
} }
err = p.addCertificateForDomain(dom, cert.Certificate, cert.PrivateKey, tlsStore) err = p.addCertificateForDomain(dom, cert, tlsStore)
if err != nil { if err != nil {
logger.WithError(err).Error("Error adding certificate for domain") logger.WithError(err).Error("Error adding certificate for domain")
} }
@ -431,7 +431,7 @@ func (p *Provider) watchNewDomains(ctx context.Context) {
return return
} }
err = p.addCertificateForDomain(dom, cert.Certificate, cert.PrivateKey, traefiktls.DefaultTLSStoreName) err = p.addCertificateForDomain(dom, cert, traefiktls.DefaultTLSStoreName)
if err != nil { if err != nil {
logger.WithError(err).Error("Error adding certificate for domain") logger.WithError(err).Error("Error adding certificate for domain")
} }
@ -468,7 +468,7 @@ func (p *Provider) watchNewDomains(ctx context.Context) {
return return
} }
err = p.addCertificateForDomain(dom, cert.Certificate, cert.PrivateKey, traefiktls.DefaultTLSStoreName) err = p.addCertificateForDomain(dom, cert, traefiktls.DefaultTLSStoreName)
if err != nil { if err != nil {
logger.WithError(err).Error("Error adding certificate for domain") logger.WithError(err).Error("Error adding certificate for domain")
} }
@ -535,7 +535,7 @@ func (p *Provider) watchNewDomains(ctx context.Context) {
domain.SANs = validDomains[1:] domain.SANs = validDomains[1:]
} }
err = p.addCertificateForDomain(domain, cert.Certificate, cert.PrivateKey, traefiktls.DefaultTLSStoreName) err = p.addCertificateForDomain(domain, cert, traefiktls.DefaultTLSStoreName)
if err != nil { if err != nil {
logger.WithError(err).Error("Error adding certificate for domain") logger.WithError(err).Error("Error adding certificate for domain")
} }
@ -660,11 +660,15 @@ func (p *Provider) removeResolvingDomains(resolvingDomains []string) {
} }
} }
func (p *Provider) addCertificateForDomain(domain types.Domain, certificate, key []byte, tlsStore string) error { func (p *Provider) addCertificateForDomain(domain types.Domain, crt *certificate.Resource, tlsStore string) error {
if crt == nil {
return nil
}
p.certificatesMu.Lock() p.certificatesMu.Lock()
defer p.certificatesMu.Unlock() defer p.certificatesMu.Unlock()
cert := Certificate{Certificate: certificate, Key: key, Domain: domain} cert := Certificate{Certificate: crt.Certificate, Key: crt.PrivateKey, Domain: domain}
certUpdated := false certUpdated := false
for _, domainsCertificate := range p.certificates { for _, domainsCertificate := range p.certificates {
@ -828,7 +832,7 @@ func (p *Provider) renewCertificates(ctx context.Context, renewPeriod time.Durat
continue continue
} }
err = p.addCertificateForDomain(cert.Domain, renewedCert.Certificate, renewedCert.PrivateKey, cert.Store) err = p.addCertificateForDomain(cert.Domain, renewedCert, cert.Store)
if err != nil { if err != nil {
logger.WithError(err).Error("Error adding certificate for domain") logger.WithError(err).Error("Error adding certificate for domain")
} }