Merge pull request #6 from philips/alpn-challenge

autocert: fix issue with challenge
merklecounty · Aug 2, 2019 · 6b0e3a7 · 6b0e3a7
2 parents 72897e9 + 56ecbaf
commit 6b0e3a7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/autocert/autocert.go b/autocert/autocert.go
@@ -280,8 +280,6 @@ func (m *Manager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate,
 		return nil, err
 	}
 
-	name = policy.CommonName
-
 	// Check whether this is a token cert requested for TLS-SNI or TLS-ALPN challenge.
 	if wantsTokenCert(hello) {
 		m.tokensMu.RLock()
@@ -299,6 +297,9 @@ func (m *Manager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate,
 		return nil, fmt.Errorf("acme/autocert: no token cert for %q", name)
 	}
 
+	// set the name after the ALPN challenge
+	name = policy.CommonName
+
 	// regular domain
 	ck := certKey{
 		domain: strings.TrimSuffix(name, "."), // golang.org/issue/18114