Commit 2b06edcc authored by Matthew Holt's avatar Matthew Holt

Use challenge domain for tls-sni solver

Matches the new upstream function signature and fixes previously broken
behavior; new solver code confirmed to work during restarts
parent daa4de57
...@@ -113,20 +113,24 @@ type tlsSniSolver struct{} ...@@ -113,20 +113,24 @@ type tlsSniSolver struct{}
// Present adds the challenge certificate to the cache. // Present adds the challenge certificate to the cache.
func (s tlsSniSolver) Present(domain, token, keyAuth string) error { func (s tlsSniSolver) Present(domain, token, keyAuth string) error {
cert, err := acme.TLSSNI01ChallengeCert(keyAuth) cert, acmeDomain, err := acme.TLSSNI01ChallengeCert(keyAuth)
if err != nil { if err != nil {
return err return err
} }
cacheCertificate(Certificate{ cacheCertificate(Certificate{
Certificate: cert, Certificate: cert,
Names: []string{domain}, Names: []string{acmeDomain},
}) })
return nil return nil
} }
// CleanUp removes the challenge certificate from the cache. // CleanUp removes the challenge certificate from the cache.
func (s tlsSniSolver) CleanUp(domain, token, keyAuth string) error { func (s tlsSniSolver) CleanUp(domain, token, keyAuth string) error {
uncacheCertificate(domain) _, acmeDomain, err := acme.TLSSNI01ChallengeCert(keyAuth)
if err != nil {
return err
}
uncacheCertificate(acmeDomain)
return nil return nil
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment