5f41d8eb1f
Make normalize return multiple "hosts" (= reverse zones) when a non-octet boundary cidr is given. Added pkg/cidr package that holds the cidr calculation routines; felt they didn't really fit dnsutil. This change means the IPNet return parameter isn't needed, the hosts are all correct. The tests that tests this is also removed: TestSplitHostPortReverse The fallout was that zoneAddr _also_ doesn't need the IPNet member, that in turn make it visible that zoneAddr in address.go duplicated a bunch of stuff from register.go; removed/refactored that too. Created a plugin.OriginsFromArgsOrServerBlock to help plugins do the right things, by consuming ZONE arguments; this now expands reverse zones correctly. This is mostly mechanical. Remove the reverse test in plugin/kubernetes which is a copy-paste from a core test (which has since been fixed). Remove MustNormalize as it has no plugin users. This change is not backwards compatible to plugins that have a ZONE argument that they parse in the setup util. All in-tree plugins have been updated. Signed-off-by: Miek Gieben <miek@miek.nl>
97 lines
2.2 KiB
Go
97 lines
2.2 KiB
Go
package plugin
|
|
|
|
import (
|
|
"sort"
|
|
"testing"
|
|
)
|
|
|
|
func TestZoneMatches(t *testing.T) {
|
|
child := "example.org."
|
|
zones := Zones([]string{"org.", "."})
|
|
actual := zones.Matches(child)
|
|
if actual != "org." {
|
|
t.Errorf("Expected %v, got %v", "org.", actual)
|
|
}
|
|
|
|
child = "bla.example.org."
|
|
zones = Zones([]string{"bla.example.org.", "org.", "."})
|
|
actual = zones.Matches(child)
|
|
|
|
if actual != "bla.example.org." {
|
|
t.Errorf("Expected %v, got %v", "org.", actual)
|
|
}
|
|
}
|
|
|
|
func TestZoneNormalize(t *testing.T) {
|
|
zones := Zones([]string{"example.org", "Example.ORG.", "example.org."})
|
|
expected := "example.org."
|
|
zones.Normalize()
|
|
|
|
for _, actual := range zones {
|
|
if actual != expected {
|
|
t.Errorf("Expected %v, got %v", expected, actual)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestNameMatches(t *testing.T) {
|
|
matches := []struct {
|
|
child string
|
|
parent string
|
|
expected bool
|
|
}{
|
|
{".", ".", true},
|
|
{"example.org.", ".", true},
|
|
{"example.org.", "example.org.", true},
|
|
{"example.org.", "org.", true},
|
|
{"org.", "example.org.", false},
|
|
}
|
|
|
|
for _, m := range matches {
|
|
actual := Name(m.parent).Matches(m.child)
|
|
if actual != m.expected {
|
|
t.Errorf("Expected %v for %s/%s, got %v", m.expected, m.parent, m.child, actual)
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
func TestNameNormalize(t *testing.T) {
|
|
names := []string{
|
|
"example.org", "example.org.",
|
|
"Example.ORG.", "example.org."}
|
|
|
|
for i := 0; i < len(names); i += 2 {
|
|
ts := names[i]
|
|
expected := names[i+1]
|
|
actual := Name(ts).Normalize()
|
|
if expected != actual {
|
|
t.Errorf("Expected %v, got %v", expected, actual)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestHostNormalize(t *testing.T) {
|
|
tests := []struct {
|
|
in string
|
|
out []string
|
|
}{
|
|
{".:53", []string{"."}},
|
|
{"example.org:53", []string{"example.org."}},
|
|
{"example.org.:53", []string{"example.org."}},
|
|
{"10.0.0.0/8:53", []string{"10.in-addr.arpa."}},
|
|
{"10.0.0.0/15", []string{"0.10.in-addr.arpa.", "1.10.in-addr.arpa."}},
|
|
{"dns://example.org", []string{"example.org."}},
|
|
}
|
|
|
|
for i := range tests {
|
|
actual := Host(tests[i].in).Normalize()
|
|
expected := tests[i].out
|
|
sort.Strings(expected)
|
|
for j := range expected {
|
|
if expected[j] != actual[j] {
|
|
t.Errorf("Test %d, expected %v, got %v", i, expected, actual)
|
|
}
|
|
}
|
|
}
|
|
}
|