Commit f9655547 authored by Miek Gieben's avatar Miek Gieben Committed by GitHub

plugin/dnssec: Drop inserting DS records on delegation (#1266)

See #1211 for disuccsion; current code is probably the wrong thing to
do; rethink if we need/want this. Comment out the code for now.
parent dce696a2
...@@ -46,16 +46,21 @@ func (d Dnssec) Sign(state request.Request, zone string, now time.Time) *dns.Msg ...@@ -46,16 +46,21 @@ func (d Dnssec) Sign(state request.Request, zone string, now time.Time) *dns.Msg
mt, _ := response.Typify(req, time.Now().UTC()) // TODO(miek): need opt record here? mt, _ := response.Typify(req, time.Now().UTC()) // TODO(miek): need opt record here?
if mt == response.Delegation { if mt == response.Delegation {
ttl := req.Ns[0].Header().Ttl // This reverts 11203e44. Reverting with git revert leads to conflicts in dnskey.go, and I'm
// not sure yet if we just should fiddle with inserting DSs or not.
ds := []dns.RR{} // Easy way to, see #1211 for discussion.
for i := range d.keys { /*
ds = append(ds, d.keys[i].D) ttl := req.Ns[0].Header().Ttl
}
if sigs, err := d.sign(ds, zone, ttl, incep, expir); err == nil { ds := []dns.RR{}
req.Ns = append(req.Ns, ds...) for i := range d.keys {
req.Ns = append(req.Ns, sigs...) ds = append(ds, d.keys[i].D)
} }
if sigs, err := d.sign(ds, zone, ttl, incep, expir); err == nil {
req.Ns = append(req.Ns, ds...)
req.Ns = append(req.Ns, sigs...)
}
*/
return req return req
} }
......
...@@ -95,7 +95,8 @@ func TestSigningCname(t *testing.T) { ...@@ -95,7 +95,8 @@ func TestSigningCname(t *testing.T) {
} }
} }
func TestZoneSigningDelegation(t *testing.T) { // Disabled for now, see #1211.
func testZoneSigningDelegation(t *testing.T) {
d, rm1, rm2 := newDnssec(t, []string{"miek.nl."}) d, rm1, rm2 := newDnssec(t, []string{"miek.nl."})
defer rm1() defer rm1()
defer rm2() defer rm2()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment