homelab/traefik
1
0
Fork 0
Code Activity

Fix acme account deletion without provider change

Browse source
This commit is contained in:
Lukas Prettenthaler 2018-07-31 11:50:03 +02:00 • committed by Traefiker Bot
parent 91cafd1752
commit 838dd8c19f
3 changed files with 109 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
acme/acme.go
View file

@ -9,6 +9,7 @@ import (
fmtlog "log"
"net"
"net/http"
"net/url"
"reflect"
"strings"
"time"
@ -183,7 +184,8 @@ func (a *ACME) leadershipListener(elected bool) error {
account := object.(*Account)
account.Init()
// Reset Account values if caServer changed, thus registration URI can be updated
if account != nil && account.Registration != nil && !strings.HasPrefix(account.Registration.URI, a.CAServer) {
if account != nil && account.Registration != nil && !isAccountMatchingCaServer(account.Registration.URI, a.CAServer) {
log.Info("Account URI does not match the current CAServer. The account will be reset")
account.reset()
}
@ -230,6 +232,20 @@ func (a *ACME) leadershipListener(elected bool) error {
return nil
}
func isAccountMatchingCaServer(accountURI string, serverURI string) bool {
aru, err := url.Parse(accountURI)
if err != nil {
log.Infof("Unable to parse account.Registration URL : %v", err)
return false
}
cau, err := url.Parse(serverURI)
if err != nil {
log.Infof("Unable to parse CAServer URL : %v", err)
return false
}
return cau.Hostname() == aru.Hostname()
}
func (a *ACME) getCertificate(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
domain := types.CanonicalDomain(clientHello.ServerName)
account := a.store.Get().(*Account)