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>
79 lines
1.7 KiB
Go
79 lines
1.7 KiB
Go
package transfer
|
|
|
|
import (
|
|
"github.com/coredns/caddy"
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
"github.com/coredns/coredns/plugin/pkg/parse"
|
|
"github.com/coredns/coredns/plugin/pkg/transport"
|
|
)
|
|
|
|
func init() {
|
|
caddy.RegisterPlugin("transfer", caddy.Plugin{
|
|
ServerType: "dns",
|
|
Action: setup,
|
|
})
|
|
}
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
t, err := parseTransfer(c)
|
|
|
|
if err != nil {
|
|
return plugin.Error("transfer", err)
|
|
}
|
|
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
|
t.Next = next
|
|
return t
|
|
})
|
|
|
|
c.OnStartup(func() error {
|
|
// find all plugins that implement Transferer and add them to Transferers
|
|
plugins := dnsserver.GetConfig(c).Handlers()
|
|
for _, pl := range plugins {
|
|
tr, ok := pl.(Transferer)
|
|
if !ok {
|
|
continue
|
|
}
|
|
t.Transferers = append(t.Transferers, tr)
|
|
}
|
|
return nil
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func parseTransfer(c *caddy.Controller) (*Transfer, error) {
|
|
t := &Transfer{}
|
|
for c.Next() {
|
|
x := &xfr{}
|
|
x.Zones = plugin.OriginsFromArgsOrServerBlock(c.RemainingArgs(), c.ServerBlockKeys)
|
|
for c.NextBlock() {
|
|
switch c.Val() {
|
|
case "to":
|
|
args := c.RemainingArgs()
|
|
if len(args) == 0 {
|
|
return nil, c.ArgErr()
|
|
}
|
|
for _, host := range args {
|
|
if host == "*" {
|
|
x.to = append(x.to, host)
|
|
continue
|
|
}
|
|
normalized, err := parse.HostPort(host, transport.Port)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
x.to = append(x.to, normalized)
|
|
}
|
|
default:
|
|
return nil, plugin.Error("transfer", c.Errf("unknown property %q", c.Val()))
|
|
}
|
|
}
|
|
if len(x.to) == 0 {
|
|
return nil, plugin.Error("transfer", c.Err("'to' is required"))
|
|
}
|
|
t.xfrs = append(t.xfrs, x)
|
|
}
|
|
return t, nil
|
|
}
|