letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not test CAA lookup behavior for "CNAME+CAA both exist."

This commit is contained in:
Tom Clegg 2015-07-27 21:51:14 -04:00
parent a843772736
commit 8ec9723166
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mocks/mocks.go
View File

@ -77,7 +77,7 @@ func (mock *MockDNS) LookupCNAME(domain string) (string, time.Duration, error) {
return "absent.com.", 30, nil return "absent.com.", 30, nil
case "cname-critical.com": case "cname-critical.com":
return "critical.com.", 30, nil return "critical.com.", 30, nil
case "cname-present.com", "cname-and-caa.com", "cname-and-dname.com", "cname-and-dname-and-caa.com": case "cname-present.com", "cname-and-dname.com":
return "cname-target.present.com.", 30, nil return "cname-target.present.com.", 30, nil
case "cname2-present.com": case "cname2-present.com":
return "cname-present.com.", 30, nil return "cname-present.com.", 30, nil
@ -102,7 +102,7 @@ func (mock *MockDNS) LookupCNAME(domain string) (string, time.Duration, error) {
// LookupDNAME is a mock // LookupDNAME is a mock
func (mock *MockDNS) LookupDNAME(domain string) (string, time.Duration, error) { func (mock *MockDNS) LookupDNAME(domain string) (string, time.Duration, error) {
switch strings.TrimRight(domain, ".") { switch strings.TrimRight(domain, ".") {
case "cname-and-dname.com", "cname-and-dname-and-caa.com", "dname-present.com": case "cname-and-dname.com", "dname-present.com":
return "dname-target.present.com.", time.Minute, nil return "dname-target.present.com.", time.Minute, nil
case "a.dname-loop.com": case "a.dname-loop.com":
return "b.dname-loop.com.", time.Minute, nil return "b.dname-loop.com.", time.Minute, nil
@ -131,7 +131,7 @@ func (mock *MockDNS) LookupCAA(domain string) ([]*dns.CAA, time.Duration, error)
record.Tag = "issue" record.Tag = "issue"
record.Value = "symantec.com" record.Value = "symantec.com"
results = append(results, &record) results = append(results, &record)
case "present.com", "cname-and-caa.com", "cname-and-dname-and-caa.com": case "present.com":
record.Tag = "issue" record.Tag = "issue"
record.Value = "letsencrypt.org" record.Value = "letsencrypt.org"
results = append(results, &record) results = append(results, &record)

1
va/validation-authority_test.go
View File

@ -578,7 +578,6 @@ func TestCAAChecking(t *testing.T) {
CAATest{"cname-present.com", true, true}, CAATest{"cname-present.com", true, true},
CAATest{"cname2-present.com", true, true}, CAATest{"cname2-present.com", true, true},
CAATest{"nx.cname2-present.com", true, true}, CAATest{"nx.cname2-present.com", true, true},
CAATest{"cname-and-dname-and-caa.com", true, true},
CAATest{"dname-present.com", true, true}, CAATest{"dname-present.com", true, true},
CAATest{"dname2cname.com", true, true}, CAATest{"dname2cname.com", true, true},
// CNAME to critical // CNAME to critical