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>
116 lines
2.6 KiB
Go
116 lines
2.6 KiB
Go
package etcd
|
|
|
|
import (
|
|
"crypto/tls"
|
|
|
|
"github.com/coredns/caddy"
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
mwtls "github.com/coredns/coredns/plugin/pkg/tls"
|
|
"github.com/coredns/coredns/plugin/pkg/upstream"
|
|
|
|
etcdcv3 "go.etcd.io/etcd/client/v3"
|
|
)
|
|
|
|
func init() { plugin.Register("etcd", setup) }
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
e, err := etcdParse(c)
|
|
if err != nil {
|
|
return plugin.Error("etcd", err)
|
|
}
|
|
|
|
dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler {
|
|
e.Next = next
|
|
return e
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func etcdParse(c *caddy.Controller) (*Etcd, error) {
|
|
etc := Etcd{PathPrefix: "skydns"}
|
|
var (
|
|
tlsConfig *tls.Config
|
|
err error
|
|
endpoints = []string{defaultEndpoint}
|
|
username string
|
|
password string
|
|
)
|
|
|
|
etc.Upstream = upstream.New()
|
|
|
|
for c.Next() {
|
|
etc.Zones = plugin.OriginsFromArgsOrServerBlock(c.RemainingArgs(), c.ServerBlockKeys)
|
|
for c.NextBlock() {
|
|
switch c.Val() {
|
|
case "stubzones":
|
|
// ignored, remove later.
|
|
case "fallthrough":
|
|
etc.Fall.SetZonesFromArgs(c.RemainingArgs())
|
|
case "debug":
|
|
/* it is a noop now */
|
|
case "path":
|
|
if !c.NextArg() {
|
|
return &Etcd{}, c.ArgErr()
|
|
}
|
|
etc.PathPrefix = c.Val()
|
|
case "endpoint":
|
|
args := c.RemainingArgs()
|
|
if len(args) == 0 {
|
|
return &Etcd{}, c.ArgErr()
|
|
}
|
|
endpoints = args
|
|
case "upstream":
|
|
// remove soon
|
|
c.RemainingArgs()
|
|
case "tls": // cert key cacertfile
|
|
args := c.RemainingArgs()
|
|
tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...)
|
|
if err != nil {
|
|
return &Etcd{}, err
|
|
}
|
|
case "credentials":
|
|
args := c.RemainingArgs()
|
|
if len(args) == 0 {
|
|
return &Etcd{}, c.ArgErr()
|
|
}
|
|
if len(args) != 2 {
|
|
return &Etcd{}, c.Errf("credentials requires 2 arguments, username and password")
|
|
}
|
|
username, password = args[0], args[1]
|
|
default:
|
|
if c.Val() != "}" {
|
|
return &Etcd{}, c.Errf("unknown property '%s'", c.Val())
|
|
}
|
|
}
|
|
}
|
|
client, err := newEtcdClient(endpoints, tlsConfig, username, password)
|
|
if err != nil {
|
|
return &Etcd{}, err
|
|
}
|
|
etc.Client = client
|
|
etc.endpoints = endpoints
|
|
|
|
return &etc, nil
|
|
}
|
|
return &Etcd{}, nil
|
|
}
|
|
|
|
func newEtcdClient(endpoints []string, cc *tls.Config, username, password string) (*etcdcv3.Client, error) {
|
|
etcdCfg := etcdcv3.Config{
|
|
Endpoints: endpoints,
|
|
TLS: cc,
|
|
}
|
|
if username != "" && password != "" {
|
|
etcdCfg.Username = username
|
|
etcdCfg.Password = password
|
|
}
|
|
cli, err := etcdcv3.New(etcdCfg)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return cli, nil
|
|
}
|
|
|
|
const defaultEndpoint = "http://localhost:2379"
|