pogpp/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

acmedns: fix CNAME support (#1847)

Browse source
This commit is contained in:
Ludovic Fernandez 2023-02-24 09:59:23 +01:00 committed by GitHub
parent 1e2793f9ec
commit 56fda1abd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
providers/dns/acmedns/acmedns.go
View file

@ -102,21 +102,25 @@ func (e ErrCNAMERequired) Error() string {
// one will be created and registered with the ACME DNS server and an ErrCNAMERequired error is returned. // one will be created and registered with the ACME DNS server and an ErrCNAMERequired error is returned.
// This will halt issuance and indicate to the user that a one-time manual setup is required for the domain. // This will halt issuance and indicate to the user that a one-time manual setup is required for the domain.
func (d *DNSProvider) Present(domain, _, keyAuth string) error { func (d *DNSProvider) Present(domain, _, keyAuth string) error {
// Compute the challenge response FQDN and TXT value for the domain based // Compute the challenge response FQDN and TXT value for the domain based on the keyAuth.
// on the keyAuth.
fqdn, value := dns01.GetRecord(domain, keyAuth) fqdn, value := dns01.GetRecord(domain, keyAuth)
// Check if credentials were previously saved for this domain. effectiveDomain := domain
// TODO(ldez) replace domain by FQDN to follow CNAME. if isCNAME(domain, fqdn) {
account, err := d.storage.Fetch(domain) effectiveDomain = fqdn
// Errors other than goacmeDNS.ErrDomainNotFound are unexpected.
if err != nil && !errors.Is(err, goacmedns.ErrDomainNotFound) {
return err
} }
// Check if credentials were previously saved for this domain.
account, err := d.storage.Fetch(effectiveDomain)
if err != nil {
if errors.Is(err, goacmedns.ErrDomainNotFound) { if errors.Is(err, goacmedns.ErrDomainNotFound) {
// The account did not exist. Create a new one and return an error // The account did not exist.
// indicating the required one-time manual CNAME setup. // Create a new one and return an error indicating the required one-time manual CNAME setup.
return d.register(domain, fqdn) return d.register(effectiveDomain, fqdn)
}
// Errors other than goacmeDNS.ErrDomainNotFound are unexpected.
return err
} }
// Update the acme-dns TXT record. // Update the acme-dns TXT record.
@ -161,3 +165,7 @@ func (d *DNSProvider) register(domain, fqdn string) error {
Target: newAcct.FullDomain, Target: newAcct.FullDomain,
} }
} }
func isCNAME(domain, fqdn string) bool {
return fmt.Sprintf("_acme-challenge.%s.", domain) != fqdn
}