StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2025-01-10 17:38:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

NS1 Fix URLFWD implementation by being more consistent (#2320)

Browse source
This commit is contained in:
Florent Thoumie 2023-05-05 06:11:57 -07:00 committed by GitHub
parent f0ea71584f
commit a8b0d4ca66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integrationTest/integration_test.go
View file

@ -645,8 +645,8 @@ func tlsa(name string, usage, selector, matchingtype uint8, target string) *mode
return r
}
func urlfwd(name, target string) *models.RecordConfig {
return makeRec(name, target, "URLFWD")
func ns1_urlfwd(name, target string) *models.RecordConfig {
return makeRec(name, target, "NS1_URLFWD")
}
func clear(items ...interface{}) *TestCase {
@ -1678,8 +1678,8 @@ func makeTests(t *testing.T) []*TestGroup {
testgroup("NS1_URLFWD tests",
only("NS1"),
tc("Add a urlfwd", urlfwd("urlfwd1", "/ http://example.com 302 2 0")),
tc("Update a urlfwd", urlfwd("urlfwd1", "/ http://example.org 301 2 0")),
tc("Add a urlfwd", ns1_urlfwd("urlfwd1", "/ http://example.com 302 2 0")),
tc("Update a urlfwd", ns1_urlfwd("urlfwd1", "/ http://example.org 301 2 0")),
),
//// IGNORE* features

2
pkg/normalize/validate.go
View file

@ -206,7 +206,7 @@ func checkTargets(rec *models.RecordConfig, domain string) (errs []error) {
if label == "@" {
check(fmt.Errorf("cannot create NS record for bare domain. Use NAMESERVER instead"))
}
case "URLFWD":
case "NS1_URLFWD":
if len(strings.Fields(target)) != 5 {
check(fmt.Errorf("record should follow format: \"from to redirectType pathForwardingMode queryForwarding\""))
}

12
pkg/normalize/validate_test.go
View file

@ -198,25 +198,25 @@ func TestNSAtRoot(t *testing.T) {
}
}
func TestURLFWDValid(t *testing.T) {
rec := &models.RecordConfig{Type: "URLFWD"}
func TestNS1URLFWDValid(t *testing.T) {
rec := &models.RecordConfig{Type: "NS1_URLFWD"}
rec.SetLabel("test1", "foo.com")
rec.SetTarget("/ http://example.com 302 2 0")
errs := checkTargets(rec, "foo.com")
if len(errs) > 0 {
t.Error("Expect no error with valid URLFWD target")
t.Error("Expect no error with valid NS1_URLFWD target")
}
}
func TestURLFWDInvalid(t *testing.T) {
rec := &models.RecordConfig{Type: "URLFWD"}
func TestNS1URLFWDInvalid(t *testing.T) {
rec := &models.RecordConfig{Type: "NS1_URLFWD"}
rec.SetLabel("test2", "foo.com")
rec.SetTarget("/ http://example.com 302 2")
errs := checkTargets(rec, "foo.com")
if len(errs) == 0 {
t.Error("Expect error with invalid URLFWD target")
t.Error("Expect error with invalid NS1_URLFWD target")
}
}