Skip to content

Commit

Permalink
namesilo: restrict CleanUp (#2287)
Browse files Browse the repository at this point in the history
  • Loading branch information
ldez authored Sep 29, 2024
1 parent c704ba5 commit 56986ea
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions providers/dns/namesilo/namesilo.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,6 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
return fmt.Errorf("namesilo: %w", err)
}

err = d.CleanUp(domain, token, keyAuth)
if err != nil {
return err
}

_, err = d.client.DnsAddRecord(&namesilo.DnsAddRecordParams{
Domain: zoneName,
Type: "TXT",
Expand Down Expand Up @@ -139,16 +134,18 @@ func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error {
return fmt.Errorf("namesilo: %w", err)
}

var lastErr error
for _, r := range resp.Reply.ResourceRecord {
if r.Type == "TXT" && (r.Host == subdomain || r.Host == dns01.UnFqdn(info.EffectiveFQDN)) {
if r.Type == "TXT" && r.Value == info.Value && (r.Host == subdomain || r.Host == dns01.UnFqdn(info.EffectiveFQDN)) {
_, err := d.client.DnsDeleteRecord(&namesilo.DnsDeleteRecordParams{Domain: zoneName, ID: r.RecordID})
if err != nil {
lastErr = fmt.Errorf("namesilo: %w", err)
return fmt.Errorf("namesilo: %w", err)
}

return nil
}
}
return lastErr

return fmt.Errorf("namesilo: no TXT record to delete for %s (%s)", info.EffectiveFQDN, info.Value)
}

// Timeout returns the timeout and interval to use when checking for DNS propagation.
Expand Down

0 comments on commit 56986ea

Please sign in to comment.