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>
263 lines
5.4 KiB
Go
263 lines
5.4 KiB
Go
package forward
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"errors"
|
|
"fmt"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/coredns/caddy"
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
"github.com/coredns/coredns/plugin/dnstap"
|
|
"github.com/coredns/coredns/plugin/pkg/parse"
|
|
pkgtls "github.com/coredns/coredns/plugin/pkg/tls"
|
|
"github.com/coredns/coredns/plugin/pkg/transport"
|
|
)
|
|
|
|
func init() { plugin.Register("forward", setup) }
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
f, err := parseForward(c)
|
|
if err != nil {
|
|
return plugin.Error("forward", err)
|
|
}
|
|
if f.Len() > max {
|
|
return plugin.Error("forward", fmt.Errorf("more than %d TOs configured: %d", max, f.Len()))
|
|
}
|
|
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
|
f.Next = next
|
|
return f
|
|
})
|
|
|
|
c.OnStartup(func() error {
|
|
return f.OnStartup()
|
|
})
|
|
c.OnStartup(func() error {
|
|
if taph := dnsserver.GetConfig(c).Handler("dnstap"); taph != nil {
|
|
if tapPlugin, ok := taph.(dnstap.Dnstap); ok {
|
|
f.tapPlugin = &tapPlugin
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
|
|
c.OnShutdown(func() error {
|
|
return f.OnShutdown()
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
// OnStartup starts a goroutines for all proxies.
|
|
func (f *Forward) OnStartup() (err error) {
|
|
for _, p := range f.proxies {
|
|
p.start(f.hcInterval)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// OnShutdown stops all configured proxies.
|
|
func (f *Forward) OnShutdown() error {
|
|
for _, p := range f.proxies {
|
|
p.stop()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func parseForward(c *caddy.Controller) (*Forward, error) {
|
|
var (
|
|
f *Forward
|
|
err error
|
|
i int
|
|
)
|
|
for c.Next() {
|
|
if i > 0 {
|
|
return nil, plugin.ErrOnce
|
|
}
|
|
i++
|
|
f, err = parseStanza(c)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return f, nil
|
|
}
|
|
|
|
func parseStanza(c *caddy.Controller) (*Forward, error) {
|
|
f := New()
|
|
|
|
if !c.Args(&f.from) {
|
|
return f, c.ArgErr()
|
|
}
|
|
f.from = plugin.Host(f.from).Normalize()[0] // there can only be one here, won't work with non-octet reverse
|
|
|
|
to := c.RemainingArgs()
|
|
if len(to) == 0 {
|
|
return f, c.ArgErr()
|
|
}
|
|
|
|
toHosts, err := parse.HostPortOrFile(to...)
|
|
if err != nil {
|
|
return f, err
|
|
}
|
|
|
|
transports := make([]string, len(toHosts))
|
|
allowedTrans := map[string]bool{"dns": true, "tls": true}
|
|
for i, host := range toHosts {
|
|
trans, h := parse.Transport(host)
|
|
|
|
if !allowedTrans[trans] {
|
|
return f, fmt.Errorf("'%s' is not supported as a destination protocol in forward: %s", trans, host)
|
|
}
|
|
p := NewProxy(h, trans)
|
|
f.proxies = append(f.proxies, p)
|
|
transports[i] = trans
|
|
}
|
|
|
|
for c.NextBlock() {
|
|
if err := parseBlock(c, f); err != nil {
|
|
return f, err
|
|
}
|
|
}
|
|
|
|
if f.tlsServerName != "" {
|
|
f.tlsConfig.ServerName = f.tlsServerName
|
|
}
|
|
|
|
// Initialize ClientSessionCache in tls.Config. This may speed up a TLS handshake
|
|
// in upcoming connections to the same TLS server.
|
|
f.tlsConfig.ClientSessionCache = tls.NewLRUClientSessionCache(len(f.proxies))
|
|
|
|
for i := range f.proxies {
|
|
// Only set this for proxies that need it.
|
|
if transports[i] == transport.TLS {
|
|
f.proxies[i].SetTLSConfig(f.tlsConfig)
|
|
}
|
|
f.proxies[i].SetExpire(f.expire)
|
|
f.proxies[i].health.SetRecursionDesired(f.opts.hcRecursionDesired)
|
|
}
|
|
|
|
return f, nil
|
|
}
|
|
|
|
func parseBlock(c *caddy.Controller, f *Forward) error {
|
|
switch c.Val() {
|
|
case "except":
|
|
ignore := c.RemainingArgs()
|
|
if len(ignore) == 0 {
|
|
return c.ArgErr()
|
|
}
|
|
for i := 0; i < len(ignore); i++ {
|
|
f.ignored = append(f.ignored, plugin.Host(ignore[i]).Normalize()...)
|
|
}
|
|
case "max_fails":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
n, err := strconv.Atoi(c.Val())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if n < 0 {
|
|
return fmt.Errorf("max_fails can't be negative: %d", n)
|
|
}
|
|
f.maxfails = uint32(n)
|
|
case "health_check":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
dur, err := time.ParseDuration(c.Val())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if dur < 0 {
|
|
return fmt.Errorf("health_check can't be negative: %d", dur)
|
|
}
|
|
f.hcInterval = dur
|
|
|
|
for c.NextArg() {
|
|
switch hcOpts := c.Val(); hcOpts {
|
|
case "no_rec":
|
|
f.opts.hcRecursionDesired = false
|
|
default:
|
|
return fmt.Errorf("health_check: unknown option %s", hcOpts)
|
|
}
|
|
}
|
|
|
|
case "force_tcp":
|
|
if c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
f.opts.forceTCP = true
|
|
case "prefer_udp":
|
|
if c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
f.opts.preferUDP = true
|
|
case "tls":
|
|
args := c.RemainingArgs()
|
|
if len(args) > 3 {
|
|
return c.ArgErr()
|
|
}
|
|
|
|
tlsConfig, err := pkgtls.NewTLSConfigFromArgs(args...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
f.tlsConfig = tlsConfig
|
|
case "tls_servername":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
f.tlsServerName = c.Val()
|
|
case "expire":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
dur, err := time.ParseDuration(c.Val())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if dur < 0 {
|
|
return fmt.Errorf("expire can't be negative: %s", dur)
|
|
}
|
|
f.expire = dur
|
|
case "policy":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
switch x := c.Val(); x {
|
|
case "random":
|
|
f.p = &random{}
|
|
case "round_robin":
|
|
f.p = &roundRobin{}
|
|
case "sequential":
|
|
f.p = &sequential{}
|
|
default:
|
|
return c.Errf("unknown policy '%s'", x)
|
|
}
|
|
case "max_concurrent":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
n, err := strconv.Atoi(c.Val())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if n < 0 {
|
|
return fmt.Errorf("max_concurrent can't be negative: %d", n)
|
|
}
|
|
f.ErrLimitExceeded = errors.New("concurrent queries exceeded maximum " + c.Val())
|
|
f.maxConcurrent = int64(n)
|
|
|
|
default:
|
|
return c.Errf("unknown property '%s'", c.Val())
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
const max = 15 // Maximum number of upstreams.
|