namedotcom: follow CNAME

go-acme · Jan 5, 2025 · a698c6d · a698c6d
1 parent b83c1d5
commit a698c6d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/providers/dns/namedotcom/namedotcom.go b/providers/dns/namedotcom/namedotcom.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/go-acme/lego/v4/challenge"
@@ -110,7 +111,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
 func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 	info := dns01.GetChallengeInfo(domain, keyAuth)
 
-	// TODO(ldez) replace domain by FQDN to follow CNAME.
+	domain = dns01.UnFqdn(strings.TrimPrefix(info.EffectiveFQDN, "_acme-challenge."))
+
 	domainDetails, err := d.client.GetDomain(&namecom.GetDomainRequest{DomainName: domain})
 	if err != nil {
 		return fmt.Errorf("namedotcom: API call failed: %w", err)
@@ -121,7 +123,6 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 		return fmt.Errorf("namedotcom: %w", err)
 	}
 
-	// TODO(ldez) replace domain by FQDN to follow CNAME.
 	request := &namecom.Record{
 		DomainName: domain,
 		Host:       subDomain,
@@ -142,15 +143,15 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 	info := dns01.GetChallengeInfo(domain, keyAuth)
 
-	// TODO(ldez) replace domain by FQDN to follow CNAME.
+	domain = dns01.UnFqdn(strings.TrimPrefix(info.EffectiveFQDN, "_acme-challenge."))
+
 	records, err := d.getRecords(domain)
 	if err != nil {
 		return fmt.Errorf("namedotcom: %w", err)
 	}
 
 	for _, rec := range records {
 		if rec.Fqdn == info.EffectiveFQDN && rec.Type == "TXT" {
-			// TODO(ldez) replace domain by FQDN to follow CNAME.
 			request := &namecom.DeleteRecordRequest{
 				DomainName: domain,
 				ID:         rec.ID,