Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-31 10:37:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in renewing default certificate

Browse Source
This commit is contained in:
Matthew Holt 2016-04-22 10:14:47 -06:00
parent 3c578dfbc1
commit 5c96ee1d9c
No known key found for this signature in database
GPG Key ID: 0D97CC73664F4D03
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
caddy/https/maintain.go
View File

@ -112,12 +112,21 @@ func renewManagedCertificates(allowPrompts bool) (err error) {
// Apply changes to the cache // Apply changes to the cache
for _, cert := range renewed { for _, cert := range renewed {
if cert.Names[len(cert.Names)-1] == "" {
// Special case: This is the default certificate, so we must
// ensure it gets updated as well, otherwise the renewal
// routine will find it and think it still needs to be renewed,
// even though we already renewed it...
certCacheMu.Lock()
delete(certCache, "")
certCacheMu.Unlock()
}
_, err := cacheManagedCertificate(cert.Names[0], cert.OnDemand) _, err := cacheManagedCertificate(cert.Names[0], cert.OnDemand)
if err != nil { if err != nil {
if client.AllowPrompts { if client.AllowPrompts {
return err // operator is present, so report error immediately return err // operator is present, so report error immediately
} }
log.Printf("[ERROR] %v", err) log.Printf("[ERROR] Caching renewed certificate: %v", err)
} }
} }
for _, cert := range deleted { for _, cert := range deleted {
@ -178,7 +187,7 @@ func updateOCSPStaples() {
if err != nil { if err != nil {
if cert.OCSP != nil { if cert.OCSP != nil {
// if it was no staple before, that's fine, otherwise we should log the error // if it was no staple before, that's fine, otherwise we should log the error
log.Printf("[ERROR] Checking OCSP for %s: %v", name, err) log.Printf("[ERROR] Checking OCSP for %v: %v", cert.Names, err)
} }
continue continue
} }