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>
69 lines
1.6 KiB
Go
69 lines
1.6 KiB
Go
package autopath
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/coredns/caddy"
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
func init() { plugin.Register("autopath", setup) }
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
ap, mw, err := autoPathParse(c)
|
|
if err != nil {
|
|
return plugin.Error("autopath", err)
|
|
}
|
|
|
|
// Do this in OnStartup, so all plugin has been initialized.
|
|
c.OnStartup(func() error {
|
|
m := dnsserver.GetConfig(c).Handler(mw)
|
|
if m == nil {
|
|
return nil
|
|
}
|
|
if x, ok := m.(AutoPather); ok {
|
|
ap.searchFunc = x.AutoPath
|
|
} else {
|
|
return plugin.Error("autopath", fmt.Errorf("%s does not implement the AutoPather interface", mw))
|
|
}
|
|
return nil
|
|
})
|
|
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
|
ap.Next = next
|
|
return ap
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func autoPathParse(c *caddy.Controller) (*AutoPath, string, error) {
|
|
ap := &AutoPath{}
|
|
mw := ""
|
|
|
|
for c.Next() {
|
|
zoneAndresolv := c.RemainingArgs()
|
|
if len(zoneAndresolv) < 1 {
|
|
return ap, "", fmt.Errorf("no resolv-conf specified")
|
|
}
|
|
resolv := zoneAndresolv[len(zoneAndresolv)-1]
|
|
if resolv[0] == '@' {
|
|
mw = resolv[1:]
|
|
} else {
|
|
// assume file on disk
|
|
rc, err := dns.ClientConfigFromFile(resolv)
|
|
if err != nil {
|
|
return ap, "", fmt.Errorf("failed to parse %q: %v", resolv, err)
|
|
}
|
|
ap.search = rc.Search
|
|
plugin.Zones(ap.search).Normalize()
|
|
ap.search = append(ap.search, "") // sentinel value as demanded.
|
|
}
|
|
zones := zoneAndresolv[:len(zoneAndresolv)-1]
|
|
ap.Zones = plugin.OriginsFromArgsOrServerBlock(zones, c.ServerBlockKeys)
|
|
}
|
|
return ap, mw, nil
|
|
}
|