diff options
author | 2016-09-07 11:10:16 +0100 | |
---|---|---|
committer | 2016-09-07 11:10:16 +0100 | |
commit | d1f17fa7e061d91aa0af7e1fb959a68db899c812 (patch) | |
tree | 0f828a0e7bd8ca86051a721dae48e8c19a0a2f0e /middleware/dnssec/dnssec.go | |
parent | 684330fd28f65a7a8d1ad01fb4c6c5db78240f29 (diff) | |
download | coredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.tar.gz coredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.tar.zst coredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.zip |
Cleanup: put middleware helper functions in pkgs (#245)
Move all (almost all) Go files in middleware into their
own packages. This makes for better naming and discoverability.
Lot of changes elsewhere to make this change.
The middleware.State was renamed to request.Request which is better,
but still does not cover all use-cases. It was also moved out middleware
because it is used by `dnsserver` as well.
A pkg/dnsutil packages was added for shared, handy, dns util functions.
All normalize functions are now put in normalize.go
Diffstat (limited to 'middleware/dnssec/dnssec.go')
-rw-r--r-- | middleware/dnssec/dnssec.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/middleware/dnssec/dnssec.go b/middleware/dnssec/dnssec.go index f517bfe2c..ea914c0ee 100644 --- a/middleware/dnssec/dnssec.go +++ b/middleware/dnssec/dnssec.go @@ -4,7 +4,9 @@ import ( "time" "github.com/miekg/coredns/middleware" - "github.com/miekg/coredns/singleflight" + "github.com/miekg/coredns/middleware/pkg/response" + "github.com/miekg/coredns/middleware/pkg/singleflight" + "github.com/miekg/coredns/request" "github.com/miekg/dns" gcache "github.com/patrickmn/go-cache" @@ -28,20 +30,21 @@ func New(zones []string, keys []*DNSKEY, next middleware.Handler) Dnssec { } } -// Sign signs the message m. it takes care of negative or nodata responses. It +// Sign signs the message in state. it takes care of negative or nodata responses. It // uses NSEC black lies for authenticated denial of existence. Signatures // creates will be cached for a short while. By default we sign for 8 days, // starting 3 hours ago. -func (d Dnssec) Sign(state middleware.State, zone string, now time.Time) *dns.Msg { +func (d Dnssec) Sign(state request.Request, zone string, now time.Time) *dns.Msg { req := state.Req - mt, _ := middleware.Classify(req) // TODO(miek): need opt record here? - if mt == middleware.Delegation { + + mt, _ := response.Classify(req) // TODO(miek): need opt record here? + if mt == response.Delegation { return req } incep, expir := incepExpir(now) - if mt == middleware.NameError { + if mt == response.NameError { if req.Ns[0].Header().Rrtype != dns.TypeSOA || len(req.Ns) > 1 { return req } |