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

6
plugin/loop/setup.go
View file

@ -59,7 +59,7 @@ func setup(c *caddy.Controller) error {
func parse(c *caddy.Controller) (*Loop, error) {
i := 0
zone := "."
zones := []string{"."}
for c.Next() {
if i > 0 {
return nil, plugin.ErrOnce
@ -70,10 +70,10 @@ func parse(c *caddy.Controller) (*Loop, error) {
}
if len(c.ServerBlockKeys) > 0 {
zone = plugin.Host(c.ServerBlockKeys[0]).Normalize()
zones = plugin.Host(c.ServerBlockKeys[0]).Normalize()
}
}
return New(zone), nil
return New(zones[0]), nil
}
// qname returns a random name. <rand.Int()>.<rand.Int().<zone>.