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

AZUREDNS: Do not warn about underscore for acm-validations.aws (#661)

Browse Source 
* Check for acm-validations.aws.
This commit is contained in:
Tom Limoncelli
2020-02-27 23:10:35 -05:00
committed by GitHub
parent a57bf35788
commit 4adef209c7
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/normalize/validate.go
View File

@ -100,7 +100,7 @@ var labelUnderscores = []string{
// these record types may contain underscores // these record types may contain underscores
var rTypeUnderscores = []string{"SRV", "TLSA", "TXT"} var rTypeUnderscores = []string{"SRV", "TLSA", "TXT"}
func checkLabel(label string, rType string, domain string, meta map[string]string) error { func checkLabel(label string, rType string, target, domain string, meta map[string]string) error {
if label == "@" { if label == "@" {
return nil return nil
} }
@ -125,6 +125,11 @@ func checkLabel(label string, rType string, domain string, meta map[string]strin
return nil return nil
} }
} }
// Don't warn for CNAMEs if the target ends with acm-validations.aws
// See https://github.com/StackExchange/dnscontrol/issues/519
if strings.HasPrefix(label, "_") && rType == "CNAME" && strings.HasSuffix(target, ".acm-validations.aws.") {
return nil
}
// Don't warn for certain label substrings // Don't warn for certain label substrings
for _, ex := range labelUnderscores { for _, ex := range labelUnderscores {
if strings.Contains(label, ex) { if strings.Contains(label, ex) {
@ -296,7 +301,7 @@ func NormalizeAndValidateConfig(config *models.DNSConfig) (errs []error) {
if err := validateRecordTypes(rec, domain.Name, pTypes); err != nil { if err := validateRecordTypes(rec, domain.Name, pTypes); err != nil {
errs = append(errs, err) errs = append(errs, err)
} }
if err := checkLabel(rec.GetLabel(), rec.Type, domain.Name, rec.Metadata); err != nil { if err := checkLabel(rec.GetLabel(), rec.Type, rec.GetTargetField(), domain.Name, rec.Metadata); err != nil {
errs = append(errs, err) errs = append(errs, err)
} }
if errs2 := checkTargets(rec, domain.Name); errs2 != nil { if errs2 := checkTargets(rec, domain.Name); errs2 != nil {

21
pkg/normalize/validate_test.go
View File

@ -12,17 +12,20 @@ func TestCheckLabel(t *testing.T) {
var tests = []struct { var tests = []struct {
label string label string
rType string rType string
target string
isError bool isError bool
hasSkipMeta bool hasSkipMeta bool
}{ }{
{"@", "A", false, false}, {"@", "A", "zap", false, false},
{"foo.bar", "A", false, false}, {"foo.bar", "A", "zap", false, false},
{"_foo", "A", true, false}, {"_foo", "A", "zap", true, false},
{"_foo", "SRV", false, false}, {"_foo", "SRV", "zap", false, false},
{"_foo", "TLSA", false, false}, {"_foo", "TLSA", "zap", false, false},
{"_foo", "TXT", false, false}, {"_foo", "TXT", "zap", false, false},
{"test.foo.tld", "A", true, false}, {"_y2", "CNAME", "foo", true, false},
{"test.foo.tld", "A", false, true}, {"_y3", "CNAME", "asfljds.acm-validations.aws", false, false},
{"test.foo.tld", "A", "zap", true, false},
{"test.foo.tld", "A", "zap", false, true},
} }
for _, test := range tests { for _, test := range tests {
@ -31,7 +34,7 @@ func TestCheckLabel(t *testing.T) {
if test.hasSkipMeta { if test.hasSkipMeta {
meta["skip_fqdn_check"] = "true" meta["skip_fqdn_check"] = "true"
} }
err := checkLabel(test.label, test.rType, "foo.tld", meta) err := checkLabel(test.label, test.rType, test.target, "foo.tld", meta)
if err != nil && !test.isError { if err != nil && !test.isError {
t.Errorf(" Expected no error but got %s", err) t.Errorf(" Expected no error but got %s", err)
} }