Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle multiple Cloudflare DNS01 challenges for the same FQDN #6191

Merged
merged 1 commit into from Jun 28, 2023
Merged

Handle multiple Cloudflare DNS01 challenges for the same FQDN #6191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 20 additions & 28 deletions pkg/issuer/acme/dns/cloudflare/cloudflare.go
View file
Open in desktop
Expand Up @@ -141,41 +141,33 @@ func FindNearestZoneForFQDN(c DNSProviderType, fqdn string) (DNSZone, error) {

// Present creates a TXT record to fulfil the dns-01 challenge
func (c *DNSProvider) Present(domain, fqdn, value string) error {
zoneID, err := c.getHostedZoneID(fqdn)
if err != nil {
return err
}
_, err := c.findTxtRecord(fqdn, value)
if err == errNoExistingRecord {
rec := cloudFlareRecord{
Type: "TXT",
Name: util.UnFqdn(fqdn),
Content: value,
TTL: 120,
}

record, err := c.findTxtRecord(fqdn)
if err != nil && err != errNoExistingRecord {
// this is a real error
return err
}
if record != nil {
if record.Content == value {
// the record is already set to the desired value
return nil
body, err := json.Marshal(rec)
if err != nil {
return err
}

_, err = c.makeRequest("DELETE", fmt.Sprintf("/zones/%s/dns_records/%s", record.ZoneID, record.ID), nil)
zoneID, err := c.getHostedZoneID(fqdn)
if err != nil {
return err
}
}

rec := cloudFlareRecord{
Type: "TXT",
Name: util.UnFqdn(fqdn),
Content: value,
TTL: 120,
}
_, err = c.makeRequest("POST", fmt.Sprintf("/zones/%s/dns_records", zoneID), bytes.NewReader(body))
if err != nil {
return err
}

body, err := json.Marshal(rec)
if err != nil {
return err
return nil
}

_, err = c.makeRequest("POST", fmt.Sprintf("/zones/%s/dns_records", zoneID), bytes.NewReader(body))
if err != nil {
return err
}
Expand All @@ -185,7 +177,7 @@ func (c *DNSProvider) Present(domain, fqdn, value string) error {

// CleanUp removes the TXT record matching the specified parameters
func (c *DNSProvider) CleanUp(domain, fqdn, value string) error {
record, err := c.findTxtRecord(fqdn)
record, err := c.findTxtRecord(fqdn, value)
// Nothing to cleanup
if err == errNoExistingRecord {
return nil
Expand All @@ -212,7 +204,7 @@ func (c *DNSProvider) getHostedZoneID(fqdn string) (string, error) {

var errNoExistingRecord = errors.New("No existing record found")

func (c *DNSProvider) findTxtRecord(fqdn string) (*cloudFlareRecord, error) {
func (c *DNSProvider) findTxtRecord(fqdn, content string) (*cloudFlareRecord, error) {
zoneID, err := c.getHostedZoneID(fqdn)
if err != nil {
return nil, err
Expand All @@ -234,7 +226,7 @@ func (c *DNSProvider) findTxtRecord(fqdn string) (*cloudFlareRecord, error) {
}

for _, rec := range records {
if rec.Name == util.UnFqdn(fqdn) {
if rec.Name == util.UnFqdn(fqdn) && rec.Content == content {
return &rec, nil
}
}
Expand Down