aboutsummaryrefslogtreecommitdiff
path: root/plugin/loop/setup.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2021-05-17 22:19:54 +0200
committerGravatar GitHub <noreply@github.com> 2021-05-17 13:19:54 -0700
commit5f41d8eb1f74621ada05968dd6b0d24f9ae742df (patch)
tree9a75f00225cea18ea04224d882eb2fc11f5933df /plugin/loop/setup.go
parent540937964890ad36b56841374f7f83ef7a2a0247 (diff)
downloadcoredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.tar.gz
coredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.tar.zst
coredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.zip
reverse zone: fix Normalize (#4621)
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>
Diffstat (limited to 'plugin/loop/setup.go')
-rw-r--r--plugin/loop/setup.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugin/loop/setup.go b/plugin/loop/setup.go
index 68af97e5e..13551c2b6 100644
--- a/plugin/loop/setup.go
+++ b/plugin/loop/setup.go
@@ -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>.