TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

reverse zone: fix Normalize (#4621)

Browse source 
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>
This commit is contained in:
Miek Gieben 2021-05-17 22:19:54 +02:00 • committed by GitHub
parent 5409379648
commit 5f41d8eb1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 259 additions and 510 deletions
Download patch file Download diff file Expand all files Collapse all files

72
plugin/normalize_test.go
View file

@ -1,6 +1,9 @@
package plugin
import "testing"
import (
"sort"
"testing"
)
func TestZoneMatches(t *testing.T) {
child := "example.org."
@ -69,55 +72,26 @@ func TestNameNormalize(t *testing.T) {
}
func TestHostNormalize(t *testing.T) {
hosts := []string{".:53", ".", "example.org:53", "example.org.", "example.org.:53", "example.org.",
"10.0.0.0/8:53", "10.in-addr.arpa.", "10.0.0.0/9", "10.in-addr.arpa.",
"dns://example.org", "example.org."}
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 := 0; i < len(hosts); i += 2 {
ts := hosts[i]
expected := hosts[i+1]
actual := Host(ts).Normalize()
if expected != actual {
t.Errorf("Expected %v, got %v", expected, actual)
}
}
}
func TestHostMustNormalizeFail(t *testing.T) {
hosts := []string{"..:53", "::", ""}
for i := 0; i < len(hosts); i++ {
ts := hosts[i]
h, err := Host(ts).MustNormalize()
if err == nil {
t.Errorf("Expected error, got %v", h)
}
}
}
func TestSplitHostPortReverse(t *testing.T) {
tests := map[string]int{
"example.org.": 0,
"10.0.0.0/9": 32 - 9,
"10.0.0.0/8": 32 - 8,
"10.0.0.0/17": 32 - 17,
"10.0.0.0/0": 32 - 0,
"10.0.0.0/64": 0,
"10.0.0.0": 0,
"10.0.0": 0,
"2003::1/65": 128 - 65,
}
for in, expect := range tests {
_, _, n, err := SplitHostPort(in)
if err != nil {
t.Errorf("Expected no error, got %q for %s", in, err)
}
if n == nil {
continue
}
ones, bits := n.Mask.Size()
got := bits - ones
if got != expect {
t.Errorf("Expected %d, got %d for %s", expect, got, in)
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)
}
}
}
}