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.
This commit is contained in:
parent
dce696a2fe
commit
f96555476e
2 changed files with 16 additions and 10 deletions
|
@ -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.
|
||||||
|
// Easy way to, see #1211 for discussion.
|
||||||
|
/*
|
||||||
|
ttl := req.Ns[0].Header().Ttl
|
||||||
|
|
||||||
ds := []dns.RR{}
|
ds := []dns.RR{}
|
||||||
for i := range d.keys {
|
for i := range d.keys {
|
||||||
ds = append(ds, d.keys[i].D)
|
ds = append(ds, d.keys[i].D)
|
||||||
}
|
}
|
||||||
if sigs, err := d.sign(ds, zone, ttl, incep, expir); err == nil {
|
if sigs, err := d.sign(ds, zone, ttl, incep, expir); err == nil {
|
||||||
req.Ns = append(req.Ns, ds...)
|
req.Ns = append(req.Ns, ds...)
|
||||||
req.Ns = append(req.Ns, sigs...)
|
req.Ns = append(req.Ns, sigs...)
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
return req
|
return req
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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()
|
||||||
|
|
Loading…
Add table
Reference in a new issue