Skip to content

CLOUDFLAREAPI: Prevent web UI from displaying warnings about TXT records #3834

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

Open
tlimoncelli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CLOUDFLAREAPI: Prevent web UI from displaying warnings about TXT records #3834

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/txtutil/txtcode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ func TestTxtEncode(t *testing.T) {
data []string
expected string
}{
{[]string{"simple"}, `"simple"`},
{[]string{`"quoted"`}, `"\"quoted\""`},
{[]string{}, `""`},
{[]string{``}, `""`},
{[]string{`foo`}, `"foo"`},
Expand Down
4 changes: 1 addition & 3 deletions providers/cloudflare/auditrecords.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import (
func AuditRecords(records []*models.RecordConfig) []error {
a := rejectif.Auditor{}

a.Add("TXT", rejectif.TxtHasTrailingSpace) // Last verified 2022-06-18

a.Add("TXT", rejectif.TxtIsEmpty) // Last verified 2022-06-18
a.Add("TXT", rejectif.TxtIsEmpty) // Last verified 2024-10-27

return a.Audit(records)
}
7 changes: 6 additions & 1 deletion providers/cloudflare/cloudflareProvider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/StackExchange/dnscontrol/v4/pkg/diff2"
"github.com/StackExchange/dnscontrol/v4/pkg/printer"
"github.com/StackExchange/dnscontrol/v4/pkg/transform"
"github.com/StackExchange/dnscontrol/v4/pkg/txtutil"
"github.com/StackExchange/dnscontrol/v4/pkg/zonecache"
"github.com/StackExchange/dnscontrol/v4/providers"
"github.com/StackExchange/dnscontrol/v4/providers/cloudflare/rtypes/cfsingleredirect"
Expand Down Expand Up @@ -871,7 +872,11 @@ func (c *cloudflareProvider) nativeToRecord(domain string, cr cloudflare.DNSReco
return nil, fmt.Errorf("unparsable SRV record received from cloudflare: %w", err)
}
case "TXT":
err := rc.SetTargetTXT(cr.Content)
s, err := txtutil.ParseQuoted(cr.Content)
if err != nil {
return rc, err
}
err = rc.SetTargetTXT(s)
return rc, err
default:
if err := rc.PopulateFromString(rType, cr.Content, domain); err != nil {
Expand Down
5 changes: 3 additions & 2 deletions providers/cloudflare/rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"golang.org/x/net/idna"

"github.com/StackExchange/dnscontrol/v4/models"
"github.com/StackExchange/dnscontrol/v4/pkg/txtutil"
"github.com/StackExchange/dnscontrol/v4/providers/cloudflare/rtypes/cfsingleredirect"
)

Expand Down Expand Up @@ -154,7 +155,7 @@ func (c *cloudflareProvider) createRecDiff2(rec *models.RecordConfig, domainID s
prio = fmt.Sprintf(" %d ", rec.MxPreference)
}
if rec.Type == "TXT" {
content = rec.GetTargetTXTJoined()
content = txtutil.EncodeQuoted(rec.GetTargetTXTJoined())
}
if rec.Type == "DS" {
content = fmt.Sprintf("%d %d %d %s", rec.DsKeyTag, rec.DsAlgorithm, rec.DsDigestType, rec.DsDigest)
Expand Down Expand Up @@ -229,7 +230,7 @@ func (c *cloudflareProvider) modifyRecord(domainID, recID string, proxied bool,
TTL: int(rec.TTL),
}
if rec.Type == "TXT" {
r.Content = rec.GetTargetTXTJoined()
r.Content = txtutil.EncodeQuoted(rec.GetTargetTXTJoined())
}
if rec.Type == "SRV" {
r.Data = cfSrvData(rec)
Expand Down
Loading