From 744468ea78e278bb59c1e50673ff5028ebea539c Mon Sep 17 00:00:00 2001 From: Chris O'Haver Date: Thu, 9 Dec 2021 11:24:48 -0500 Subject: [PATCH] add wildcard warnings (#5030) Signed-off-by: Chris O'Haver --- plugin/kubernetes/handler.go | 11 +++++++++++ plugin/kubernetes/kubernetes.go | 1 + plugin/kubernetes/setup.go | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/plugin/kubernetes/handler.go b/plugin/kubernetes/handler.go index 336fd08db..b232417a3 100644 --- a/plugin/kubernetes/handler.go +++ b/plugin/kubernetes/handler.go @@ -2,6 +2,8 @@ package kubernetes import ( "context" + "strings" + "sync/atomic" "github.com/coredns/coredns/plugin" "github.com/coredns/coredns/request" @@ -27,6 +29,10 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M err error ) + if wildQuestion(state.Name()) { + atomic.AddUint64(&wildCount, 1) + } + switch state.QType() { case dns.TypeA: records, err = plugin.A(ctx, &k, zone, state, nil, plugin.Options{}) @@ -85,8 +91,13 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M m.Answer = append(m.Answer, records...) m.Extra = append(m.Extra, extra...) w.WriteMsg(m) + return dns.RcodeSuccess, nil } +func wildQuestion(name string) bool { + return strings.HasPrefix(name, "*.") || strings.HasPrefix(name, "any.") || strings.Contains(name, ".*.") || strings.Contains(name, ".any.") +} + // Name implements the Handler interface. func (k Kubernetes) Name() string { return "kubernetes" } diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go index f28f7825b..ad7453351 100644 --- a/plugin/kubernetes/kubernetes.go +++ b/plugin/kubernetes/kubernetes.go @@ -86,6 +86,7 @@ var ( errNoItems = errors.New("no items found") errNsNotExposed = errors.New("namespace is not exposed") errInvalidRequest = errors.New("invalid query name") + wildCount uint64 ) // Services implements the ServiceBackend interface. diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go index 5f5ab0582..06ba2a944 100644 --- a/plugin/kubernetes/setup.go +++ b/plugin/kubernetes/setup.go @@ -7,6 +7,8 @@ import ( "os" "strconv" "strings" + "sync/atomic" + "time" "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" @@ -61,6 +63,25 @@ func setup(c *caddy.Controller) error { return nil }) + wildWarner := time.NewTicker(10 * time.Second) + c.OnStartup(func() error { + go func() { + for { + select { + case <-wildWarner.C: + if wc := atomic.SwapUint64(&wildCount, 0); wc > 0 { + log.Warningf("%d deprecated wildcard queries received. Wildcard queries will no longer be supported in the next minor release.", wc) + } + } + } + }() + return nil + }) + c.OnShutdown(func() error { + wildWarner.Stop() + return nil + }) + return nil }