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

alicloud: add support for domain with punycode (#1088)

Browse source
This commit is contained in:
akillcool 2020-03-19 16:26:48 +08:00 committed by GitHub
parent 7bb614080b
commit 6bc93456ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
providers/dns/alidns/alidns.go
View file

@ -13,6 +13,7 @@ import (
"github.com/aliyun/alibaba-cloud-sdk-go/services/alidns" "github.com/aliyun/alibaba-cloud-sdk-go/services/alidns"
"github.com/go-acme/lego/v3/challenge/dns01" "github.com/go-acme/lego/v3/challenge/dns01"
"github.com/go-acme/lego/v3/platform/config/env" "github.com/go-acme/lego/v3/platform/config/env"
"golang.org/x/net/idna"
) )
const defaultRegionID = "cn-hangzhou" const defaultRegionID = "cn-hangzhou"
@ -114,7 +115,10 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
return fmt.Errorf("alicloud: %w", err) return fmt.Errorf("alicloud: %w", err)
} }
recordAttributes := d.newTxtRecord(zoneName, fqdn, value) recordAttributes, err := d.newTxtRecord(zoneName, fqdn, value)
if err != nil {
return err
}
_, err = d.client.AddDomainRecord(recordAttributes) _, err = d.client.AddDomainRecord(recordAttributes)
if err != nil { if err != nil {
@ -178,7 +182,7 @@ func (d *DNSProvider) getHostedZone(domain string) (string, error) {
var hostedZone alidns.Domain var hostedZone alidns.Domain
for _, zone := range domains { for _, zone := range domains {
if zone.DomainName == dns01.UnFqdn(authZone) { if zone.DomainName == dns01.UnFqdn(authZone) || zone.PunyCode == dns01.UnFqdn(authZone) {
hostedZone = zone hostedZone = zone
} }
} }
@ -190,14 +194,21 @@ func (d *DNSProvider) getHostedZone(domain string) (string, error) {
return hostedZone.DomainName, nil return hostedZone.DomainName, nil
} }
func (d *DNSProvider) newTxtRecord(zone, fqdn, value string) *alidns.AddDomainRecordRequest { func (d *DNSProvider) newTxtRecord(zone, fqdn, value string) (*alidns.AddDomainRecordRequest, error) {
request := alidns.CreateAddDomainRecordRequest() request := alidns.CreateAddDomainRecordRequest()
request.Type = "TXT" request.Type = "TXT"
request.DomainName = zone request.DomainName = zone
request.RR = d.extractRecordName(fqdn, zone)
var err error
request.RR, err = d.extractRecordName(fqdn, zone)
if err != nil {
return nil, err
}
request.Value = value request.Value = value
request.TTL = requests.NewInteger(d.config.TTL) request.TTL = requests.NewInteger(d.config.TTL)
return request
return request, nil
} }
func (d *DNSProvider) findTxtRecords(domain, fqdn string) ([]alidns.Record, error) { func (d *DNSProvider) findTxtRecords(domain, fqdn string) ([]alidns.Record, error) {
@ -217,7 +228,11 @@ func (d *DNSProvider) findTxtRecords(domain, fqdn string) ([]alidns.Record, erro
return records, fmt.Errorf("API call has failed: %w", err) return records, fmt.Errorf("API call has failed: %w", err)
} }
recordName := d.extractRecordName(fqdn, zoneName) recordName, err := d.extractRecordName(fqdn, zoneName)
if err != nil {
return nil, err
}
for _, record := range result.DomainRecords.Record { for _, record := range result.DomainRecords.Record {
if record.RR == recordName { if record.RR == recordName {
records = append(records, record) records = append(records, record)
@ -226,10 +241,15 @@ func (d *DNSProvider) findTxtRecords(domain, fqdn string) ([]alidns.Record, erro
return records, nil return records, nil
} }
func (d *DNSProvider) extractRecordName(fqdn, domain string) string { func (d *DNSProvider) extractRecordName(fqdn, domain string) (string, error) {
name := dns01.UnFqdn(fqdn) asciiDomain, err := idna.ToASCII(domain)
if idx := strings.Index(name, "."+domain); idx != -1 { if err != nil {
return name[:idx] return "", fmt.Errorf("fail to convert punycode: %w", err)
} }
return name
name := dns01.UnFqdn(fqdn)
if idx := strings.Index(name, "."+asciiDomain); idx != -1 {
return name[:idx], nil
}
return name, nil
} }