Adding double-quotes to TXT record content (#24)

* wrapping TXT record content in double-quotes

* cleanup

* cleanup

* cleanup

* adding backward compatibility for existing unquoted content

* cleanup

* cleanup

* moving to rr to cover make it more flexible

---------

Co-authored-by: Ray Janoka <[email protected]>

Author: rayjanoka

client.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 
 	"github.com/libdns/libdns"
 )
@@ -59,13 +60,24 @@ func (p *Provider) updateRecord(ctx context.Context, oldRec, newRec cfDNSRecord)
 }
 
 func (p *Provider) getDNSRecords(ctx context.Context, zoneInfo cfZone, rec libdns.Record, matchContent bool) ([]cfDNSRecord, error) {
-	rr := rec.RR()
+	rr, err := cloudflareRecord(rec)
+	if err != nil {
+		return nil, err
+	}
 
 	qs := make(url.Values)
 	qs.Set("type", rr.Type)
 	qs.Set("name", libdns.AbsoluteName(rr.Name, zoneInfo.Name))
+
+	var unwrappedContent string
 	if matchContent {
-		qs.Set("content", rr.Data)
+		if rr.Type == "TXT" {
+			unwrappedContent = unwrapContent(rr.Content)
+			// Use the contains (wildcard) search with unquoted content to return both quoted and unquoted content
+			qs.Set("content.contains", unwrappedContent)
+		} else {
+			qs.Set("content.exact", rr.Content)
+		}
 	}
 
 	reqURL := fmt.Sprintf("%s/zones/%s/dns_records?%s", baseURL, zoneInfo.ID, qs.Encode())
@@ -76,6 +88,26 @@ func (p *Provider) getDNSRecords(ctx context.Context, zoneInfo cfZone, rec libdn
 
 	var results []cfDNSRecord
 	_, err = p.doAPIRequest(req, &results)
+
+	// Since the TXT search used contains (wildcard), check for exact matches
+	if matchContent && rr.Type == "TXT" {
+		for i := 0; i < len(results); i++ {
+			// Prefer exact quoted content
+			if results[i].Content == rr.Content {
+				return []cfDNSRecord{results[i]}, nil
+			}
+		}
+
+		for i := 0; i < len(results); i++ {
+			// Using exact unquoted content is acceptable
+			if results[i].Content == unwrappedContent {
+				return []cfDNSRecord{results[i]}, nil
+			}
+		}
+
+		return []cfDNSRecord{}, nil
+	}
+
 	return results, err
 }
 
@@ -167,3 +199,17 @@ func (p *Provider) doAPIRequest(req *http.Request, result any) (cfResponse, erro
 }
 
 const baseURL = "https://api.cloudflare.com/client/v4"
+
+func unwrapContent(content string) string {
+	if strings.HasPrefix(content, `"`) && strings.HasSuffix(content, `"`) {
+		content = strings.TrimPrefix(strings.TrimSuffix(content, `"`), `"`)
+	}
+	return content
+}
+
+func wrapContent(content string) string {
+	if !strings.HasPrefix(content, `"`) && !strings.HasSuffix(content, `"`) {
+		content = fmt.Sprintf("%q", content)
+	}
+	return content
+}

models.go

@@ -181,10 +181,12 @@ func (r cfDNSRecord) libdnsRecord(zone string) (libdns.Record, error) {
 			Target:    r.Data.Target,
 		}, nil
 	case "TXT":
+		// unwrap the quotes from the content
+		unwrappedContent := unwrapContent(r.Content)
 		return libdns.TXT{
 			Name: name,
 			TTL:  ttl,
-			Text: r.Content,
+			Text: unwrappedContent,
 		}, nil
 	// NOTE: HTTPS records from Cloudflare have a `r.Content` that can be
 	// parsed by [libdns.RR.Parse] so that is what we do here. While we are
@@ -242,6 +244,10 @@ func cloudflareRecord(r libdns.Record) (cfDNSRecord, error) {
 	if rr.Type == "CNAME" && strings.HasSuffix(cfRec.Content, ".cfargotunnel.com") {
 		cfRec.Proxied = true
 	}
+	if rr.Type == "TXT" {
+		// wrap the content in quotes
+		cfRec.Content = wrapContent(cfRec.Content)
+	}
 	return cfRec, nil
 }