mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

Merge branch 'master' into tlim_newtxt

Browse Source
This commit is contained in:
Tom Limoncelli
2023-10-18 10:48:24 -04:00
parent f3dd7bb24e 397c2dcc7a
commit 5c8d51e235
106 changed files with 4065 additions and 1980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
commands/getZones.go
View File

@@ -70,7 +70,7 @@ EXAMPLES:
dnscontrol get-zones gmain GANDI_V5 example.com other.com
dnscontrol get-zones cfmain CLOUDFLAREAPI all
dnscontrol get-zones --format=tsv bind BIND example.com
dnscontrol get-zones --format=djs --out=draft.js glcoud GCLOUD example.com`,
dnscontrol get-zones --format=djs --out=draft.js gcloud GCLOUD example.com`,
}
}())
@@ -329,9 +329,9 @@ func formatDsl(zonename string, rec *models.RecordConfig, defaultTTL uint32) str
case "CAA":
return makeCaa(rec, ttlop)
case "DS":
target = fmt.Sprintf("%d, %d, %d, \"%s\"", rec.DsKeyTag, rec.DsAlgorithm, rec.DsDigestType, rec.DsDigest)
target = fmt.Sprintf(`%d, %d, %d, "%s"`, rec.DsKeyTag, rec.DsAlgorithm, rec.DsDigestType, rec.DsDigest)
case "MX":
target = fmt.Sprintf("%d, \"%s\"", rec.MxPreference, rec.GetTargetField())
target = fmt.Sprintf(`%d, "%s"`, rec.MxPreference, rec.GetTargetField())
case "NAPTR":
target = fmt.Sprintf(`%d, %d, %s, %s, %s, %s`,
rec.NaptrOrder, // 1
@@ -342,54 +342,58 @@ func formatDsl(zonename string, rec *models.RecordConfig, defaultTTL uint32) str
jsonQuoted(rec.GetTargetField()), // .
)
case "SSHFP":
target = fmt.Sprintf("%d, %d, \"%s\"", rec.SshfpAlgorithm, rec.SshfpFingerprint, rec.GetTargetField())
target = fmt.Sprintf(`%d, %d, "%s"`, rec.SshfpAlgorithm, rec.SshfpFingerprint, rec.GetTargetField())
case "SOA":
rec.Type = "//SOA"
target = fmt.Sprintf("\"%s\", \"%s\", %d, %d, %d, %d, %d", rec.GetTargetField(), rec.SoaMbox, rec.SoaSerial, rec.SoaRefresh, rec.SoaRetry, rec.SoaExpire, rec.SoaMinttl)
target = fmt.Sprintf(`"%s", "%s", %d, %d, %d, %d, %d`, rec.GetTargetField(), rec.SoaMbox, rec.SoaSerial, rec.SoaRefresh, rec.SoaRetry, rec.SoaExpire, rec.SoaMinttl)
case "SRV":
target = fmt.Sprintf("%d, %d, %d, \"%s\"", rec.SrvPriority, rec.SrvWeight, rec.SrvPort, rec.GetTargetField())
target = fmt.Sprintf(`%d, %d, %d, "%s"`, rec.SrvPriority, rec.SrvWeight, rec.SrvPort, rec.GetTargetField())
case "TLSA":
target = fmt.Sprintf("%d, %d, %d, \"%s\"", rec.TlsaUsage, rec.TlsaSelector, rec.TlsaMatchingType, rec.GetTargetField())
target = fmt.Sprintf(`%d, %d, %d, "%s"`, rec.TlsaUsage, rec.TlsaSelector, rec.TlsaMatchingType, rec.GetTargetField())
case "TXT":
target = jsonQuoted(rec.GetTargetField())
if len(rec.TxtStrings) == 1 {
target = `"` + rec.TxtStrings[0] + `"`
} else {
target = `["` + strings.Join(rec.TxtStrings, `", "`) + `"]`
}
// TODO(tlim): If this is an SPF record, generate a SPF_BUILDER().
case "NS":
// NS records at the apex should be NAMESERVER() records.
// DnsControl uses the API to get this info. NAMESERVER() is just
// to override that when needed.
if rec.Name == "@" {
return fmt.Sprintf("//NAMESERVER(\"%s\")", target)
return fmt.Sprintf(`//NAMESERVER("%s")`, target)
}
target = "\"" + target + "\""
target = `"` + target + `"`
case "R53_ALIAS":
return makeR53alias(rec, ttl)
default:
target = "\"" + target + "\""
target = `"` + target + `"`
}
return fmt.Sprintf("%s(\"%s\", %s%s%s)", rec.Type, rec.Name, target, cfproxy, ttlop)
return fmt.Sprintf(`%s("%s", %s%s%s)`, rec.Type, rec.Name, target, cfproxy, ttlop)
}
func makeCaa(rec *models.RecordConfig, ttlop string) string {
var target string
if rec.CaaFlag == 128 {
target = fmt.Sprintf("\"%s\", \"%s\", CAA_CRITICAL", rec.CaaTag, rec.GetTargetField())
target = fmt.Sprintf(`"%s", "%s", CAA_CRITICAL`, rec.CaaTag, rec.GetTargetField())
} else {
target = fmt.Sprintf("\"%s\", \"%s\"", rec.CaaTag, rec.GetTargetField())
target = fmt.Sprintf(`"%s", "%s"`, rec.CaaTag, rec.GetTargetField())
}
return fmt.Sprintf("%s(\"%s\", %s%s)", rec.Type, rec.Name, target, ttlop)
return fmt.Sprintf(`%s("%s", %s%s)`, rec.Type, rec.Name, target, ttlop)
// TODO(tlim): Generate a CAA_BUILDER() instead?
}
func makeR53alias(rec *models.RecordConfig, ttl uint32) string {
items := []string{
"\"" + rec.Name + "\"",
"\"" + rec.R53Alias["type"] + "\"",
"\"" + rec.GetTargetField() + "\"",
`"` + rec.Name + `"`,
`"` + rec.R53Alias["type"] + `"`,
`"` + rec.GetTargetField() + `"`,
}
if z, ok := rec.R53Alias["zone_id"]; ok {
items = append(items, "R53_ZONE(\""+z+"\")")
items = append(items, `R53_ZONE("`+z+`")`)
}
if ttl != 0 {
items = append(items, fmt.Sprintf("TTL(%d)", ttl))