Merge branch 'master' into http01-dpi

orangepizza · web-flow · commit 3aea3c7fb3dc · 2023-02-21T21:39:47.000+09:00
diff --git a/providers/dns/dynu/dynu.go b/providers/dns/dynu/dynu.go
@@ -97,8 +97,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
 func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 	fqdn, value := dns01.GetRecord(domain, keyAuth)
 
-	// TODO(ldez) replace domain by FQDN to follow CNAME.
-	rootDomain, err := d.client.GetRootDomain(domain)
+	rootDomain, err := d.client.GetRootDomain(dns01.UnFqdn(fqdn))
 	if err != nil {
 		return fmt.Errorf("dynu: could not find root domain for %s: %w", domain, err)
 	}
@@ -115,7 +114,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 		}
 	}
 
-	subDomain, err := dns01.ExtractSubDomain(fqdn, domain)
+	subDomain, err := dns01.ExtractSubDomain(fqdn, rootDomain.DomainName)
 	if err != nil {
 		return fmt.Errorf("dynu: %w", err)
 	}
@@ -142,8 +141,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
 func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 	fqdn, value := dns01.GetRecord(domain, keyAuth)
 
-	// TODO(ldez) replace domain by FQDN to follow CNAME.
-	rootDomain, err := d.client.GetRootDomain(domain)
+	rootDomain, err := d.client.GetRootDomain(dns01.UnFqdn(fqdn))
 	if err != nil {
 		return fmt.Errorf("dynu: could not find root domain for %s: %w", domain, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {`
`97`	`97`	`func (d *DNSProvider) Present(domain, token, keyAuth string) error {`
`98`	`98`	`fqdn, value := dns01.GetRecord(domain, keyAuth)`
`99`	`99`
`100`		`- // TODO(ldez) replace domain by FQDN to follow CNAME.`
`101`		`- rootDomain, err := d.client.GetRootDomain(domain)`
	`100`	`+ rootDomain, err := d.client.GetRootDomain(dns01.UnFqdn(fqdn))`
`102`	`101`	`if err != nil {`
`103`	`102`	`return fmt.Errorf("dynu: could not find root domain for %s: %w", domain, err)`
`104`	`103`	`}`
`@@ -115,7 +114,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {`
`115`	`114`	`}`
`116`	`115`	`}`
`117`	`116`
`118`		`- subDomain, err := dns01.ExtractSubDomain(fqdn, domain)`
	`117`	`+ subDomain, err := dns01.ExtractSubDomain(fqdn, rootDomain.DomainName)`
`119`	`118`	`if err != nil {`
`120`	`119`	`return fmt.Errorf("dynu: %w", err)`
`121`	`120`	`}`
`@@ -142,8 +141,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {`
`142`	`141`	`func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {`
`143`	`142`	`fqdn, value := dns01.GetRecord(domain, keyAuth)`
`144`	`143`
`145`		`- // TODO(ldez) replace domain by FQDN to follow CNAME.`
`146`		`- rootDomain, err := d.client.GetRootDomain(domain)`
	`144`	`+ rootDomain, err := d.client.GetRootDomain(dns01.UnFqdn(fqdn))`
`147`	`145`	`if err != nil {`
`148`	`146`	`return fmt.Errorf("dynu: could not find root domain for %s: %w", domain, err)`
`149`	`147`	`}`