ba1efee4f1
Every plugin needs to deal with EDNS0 and should call Scrub to make a message fit the client's buffer. Move this functionality into the server and wrapping the ResponseWriter into a ScrubWriter that handles these bits for us. Result: Less code and faster, because multiple chained plugins could all be calling scrub and SizeAndDo - now there is just one place. Most tests in file/* and dnssec/* needed adjusting because in those unit tests you don't see OPT RRs anymore. The DNSSEC signer was also looking at the returned OPT RR to see if it needed to sign - as those are now added by the server (and thus later), this needed to change slightly. Scrub itself still exist (for backward compat reasons), but has been made a noop. Scrub has been renamed to scrub as it should not be used by external plugins. Fixes: #2010 Signed-off-by: Miek Gieben <miek@miek.nl>
94 lines
2.6 KiB
Go
94 lines
2.6 KiB
Go
package etcd
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/coredns/coredns/plugin"
|
|
"github.com/coredns/coredns/request"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// ServeDNS implements the plugin.Handler interface.
|
|
func (e *Etcd) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
|
|
opt := plugin.Options{}
|
|
state := request.Request{W: w, Req: r, Context: ctx}
|
|
|
|
name := state.Name()
|
|
|
|
// We need to check stubzones first, because we may get a request for a zone we
|
|
// are not auth. for *but* do have a stubzone forward for. If we do the stubzone
|
|
// handler will handle the request.
|
|
if e.Stubmap != nil && len(*e.Stubmap) > 0 {
|
|
for zone := range *e.Stubmap {
|
|
if plugin.Name(zone).Matches(name) {
|
|
stub := Stub{Etcd: e, Zone: zone}
|
|
return stub.ServeDNS(ctx, w, r)
|
|
}
|
|
}
|
|
}
|
|
|
|
zone := plugin.Zones(e.Zones).Matches(state.Name())
|
|
if zone == "" {
|
|
return plugin.NextOrFailure(e.Name(), e.Next, ctx, w, r)
|
|
}
|
|
|
|
var (
|
|
records, extra []dns.RR
|
|
err error
|
|
)
|
|
|
|
switch state.QType() {
|
|
case dns.TypeA:
|
|
records, err = plugin.A(e, zone, state, nil, opt)
|
|
case dns.TypeAAAA:
|
|
records, err = plugin.AAAA(e, zone, state, nil, opt)
|
|
case dns.TypeTXT:
|
|
records, err = plugin.TXT(e, zone, state, opt)
|
|
case dns.TypeCNAME:
|
|
records, err = plugin.CNAME(e, zone, state, opt)
|
|
case dns.TypePTR:
|
|
records, err = plugin.PTR(e, zone, state, opt)
|
|
case dns.TypeMX:
|
|
records, extra, err = plugin.MX(e, zone, state, opt)
|
|
case dns.TypeSRV:
|
|
records, extra, err = plugin.SRV(e, zone, state, opt)
|
|
case dns.TypeSOA:
|
|
records, err = plugin.SOA(e, zone, state, opt)
|
|
case dns.TypeNS:
|
|
if state.Name() == zone {
|
|
records, extra, err = plugin.NS(e, zone, state, opt)
|
|
break
|
|
}
|
|
fallthrough
|
|
default:
|
|
// Do a fake A lookup, so we can distinguish between NODATA and NXDOMAIN
|
|
_, err = plugin.A(e, zone, state, nil, opt)
|
|
}
|
|
if err != nil && e.IsNameError(err) {
|
|
if e.Fall.Through(state.Name()) {
|
|
return plugin.NextOrFailure(e.Name(), e.Next, ctx, w, r)
|
|
}
|
|
// Make err nil when returning here, so we don't log spam for NXDOMAIN.
|
|
return plugin.BackendError(e, zone, dns.RcodeNameError, state, nil /* err */, opt)
|
|
}
|
|
if err != nil {
|
|
return plugin.BackendError(e, zone, dns.RcodeServerFailure, state, err, opt)
|
|
}
|
|
|
|
if len(records) == 0 {
|
|
return plugin.BackendError(e, zone, dns.RcodeSuccess, state, err, opt)
|
|
}
|
|
|
|
m := new(dns.Msg)
|
|
m.SetReply(r)
|
|
m.Authoritative, m.RecursionAvailable = true, true
|
|
m.Answer = append(m.Answer, records...)
|
|
m.Extra = append(m.Extra, extra...)
|
|
|
|
w.WriteMsg(m)
|
|
return dns.RcodeSuccess, nil
|
|
}
|
|
|
|
// Name implements the Handler interface.
|
|
func (e *Etcd) Name() string { return "etcd" }
|