xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ndb/dns: handle dnskey RR's (thanks moody)

Browse source 
On 12/18/20, Jacob Moody wrote:
> Hello,
>
> I recently ran in to some issues with pointing an unbound server towards a
> 9front dns server as its upstream.
> The parsing seemed to fail when ndb/dns received a DNSKEY RR from it's own
> upstream source on behalf of unbound.
> This patch catches and stores the DNSKEY from the upstream server to prevent
> this.
This commit is contained in:
cinap_lenrek 2020-12-20 23:08:11 +01:00
parent e4ce6aadac
commit 41c60689b3
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/src/cmd/ndb/convDNS2M.c
View file

@ -275,6 +275,7 @@ convRR2M(RR *rp, uchar *p, uchar *ep, Dict *dp)
NAME(rp->rmb->name); NAME(rp->rmb->name);
NAME(rp->rp->name); NAME(rp->rp->name);
break; break;
case Tdnskey:
case Tkey: case Tkey:
USHORT(rp->key->flags); USHORT(rp->key->flags);
UCHAR(rp->key->proto); UCHAR(rp->key->proto);

1
sys/src/cmd/ndb/convM2DNS.c
View file

@ -448,6 +448,7 @@ retry:
rp->rmb = dnlookup(NAME(dname), Cin, 1); rp->rmb = dnlookup(NAME(dname), Cin, 1);
rp->rp = dnlookup(NAME(dname), Cin, 1); rp->rp = dnlookup(NAME(dname), Cin, 1);
break; break;
case Tdnskey:
case Tkey: case Tkey:
USHORT(rp->key->flags); USHORT(rp->key->flags);
UCHAR(rp->key->proto); UCHAR(rp->key->proto);

5
sys/src/cmd/ndb/dn.c
View file

@ -893,6 +893,7 @@ rrcopy(RR *rp, RR **last)
nrp->srv = srv; nrp->srv = srv;
*srv = *rp->srv; *srv = *rp->srv;
break; break;
case Tdnskey:
case Tkey: case Tkey:
key = nrp->key; key = nrp->key;
*nrp = *rp; *nrp = *rp;
@ -1273,6 +1274,7 @@ rrfmt(Fmt *f)
case Trp: case Trp:
fmtprint(&fstr, "\t%s %s", dnname(rp->rmb), dnname(rp->rp)); fmtprint(&fstr, "\t%s %s", dnname(rp->rmb), dnname(rp->rp));
break; break;
case Tdnskey:
case Tkey: case Tkey:
if (rp->key == nil) if (rp->key == nil)
fmtprint(&fstr, "\t<null> <null> <null>"); fmtprint(&fstr, "\t<null> <null> <null>");
@ -1413,6 +1415,7 @@ rravfmt(Fmt *f)
idnname(rp->rmb, buf, sizeof(buf)), idnname(rp->rmb, buf, sizeof(buf)),
idnname(rp->rp, buf, sizeof(buf))); idnname(rp->rp, buf, sizeof(buf)));
break; break;
case Tdnskey:
case Tkey: case Tkey:
if (rp->key == nil) if (rp->key == nil)
fmtprint(&fstr, " flags=<null> proto=<null> alg=<null>"); fmtprint(&fstr, " flags=<null> proto=<null> alg=<null>");
@ -1951,6 +1954,7 @@ rralloc(int type)
rp->srv = emalloc(sizeof(*rp->srv)); rp->srv = emalloc(sizeof(*rp->srv));
setmalloctag(rp->srv, rp->pc); setmalloctag(rp->srv, rp->pc);
break; break;
case Tdnskey:
case Tkey: case Tkey:
rp->key = emalloc(sizeof(*rp->key)); rp->key = emalloc(sizeof(*rp->key));
setmalloctag(rp->key, rp->pc); setmalloctag(rp->key, rp->pc);
@ -1994,6 +1998,7 @@ rrfree(RR *rp)
memset(rp->srv, 0, sizeof *rp->srv); /* cause trouble */ memset(rp->srv, 0, sizeof *rp->srv); /* cause trouble */
free(rp->srv); free(rp->srv);
break; break;
case Tdnskey:
case Tkey: case Tkey:
free(rp->key->data); free(rp->key->data);
memset(rp->key, 0, sizeof *rp->key); /* cause trouble */ memset(rp->key, 0, sizeof *rp->key); /* cause trouble */