X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Ftypes.c;h=c1d235ebb389fb27e2f9881d2e01afb18964d867;hp=cb343beb8d4e6177042a51289147f6df35716f72;hb=1bc731c6994dda2c1ab12fb2d8261246bcbc139c;hpb=07c3d3e2ca60a3dba7843ebeccc3dc06f3c8ce5d diff --git a/src/types.c b/src/types.c index cb343be..c1d235e 100644 --- a/src/types.c +++ b/src/types.c @@ -24,6 +24,7 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include @@ -50,8 +51,9 @@ * _inaddr (pa,di,cs * +search_sortlist, dip_genaddr, csp_genaddr) * _in6addr (pa,di,cs) - * _addr (pa,di,div,csp,cs,gsz - * +search_sortlist_sa, dip_sockaddr) + * _addr (pap,pa,di,div,csp,cs,gsz,qs + * +search_sortlist_sa, dip_sockaddr, + * addr_rrtypes, addr_submit, icb_addr) * _domain (pap,csp,cs) * _dom_raw (pa) * _host_raw (pa) @@ -342,19 +344,114 @@ static adns_status cs_in6addr(vbuf *vb, const void *datap) { } /* - * _addr (pa,di,div,csp,cs,gsz +search_sortlist_sa, dip_sockaddr) + * _addr (pap,pa,di,div,csp,cs,gsz,qs + * +search_sortlist_sa, dip_sockaddr, addr_rrtypes, + * addr_submit, icb_addr) */ -static adns_status pa_addr(const parseinfo *pai, int cbyte, - int max, void *datap) { - adns_rr_addr *storeto= datap; +static const typeinfo tinfo_addrsub; + +#define ADDR_RRTYPES(_) _(a) _(aaaa) + +static const adns_rrtype addr_all_rrtypes[] = { +#define RRTY_CODE(ty) adns_r_##ty, + ADDR_RRTYPES(RRTY_CODE) +#undef RRTY_CODE +}; + +enum { +#define RRTY_INDEX(ty) addr__ri_##ty, + ADDR_RRTYPES(RRTY_INDEX) +#undef RRTY_INDEX + addr_nrrtypes, +#define RRTY_FLAG(ty) addr_rf_##ty = 1 << addr__ri_##ty, + ADDR_RRTYPES(RRTY_FLAG) + addr__rrty_hunoz +#undef RRTY_FLAG +}; + +static unsigned addr_rrtypeflag(adns_rrtype type) { + int i; + + type &= adns_rrt_typemask; + for (i=0; icname slot. We discard address records from the + * wrong name. And finally we cancel the outstanding child queries, and + * resubmit address queries for the address families we don't yet have, with + * adns__qf_addr_cname set so that we know that we're in the fixup state. + */ + +static adns_status pap_addr(const parseinfo *pai, int rrty, size_t rrsz, + int *cbyte_io, int max, adns_rr_addr *storeto) { const byte *dgram= pai->dgram; + int af, addrlen, salen; + struct in6_addr v6map; + const void *oaddr= dgram + *cbyte_io; + int avail= max - *cbyte_io; + int step= -1; + void *addrp= 0; + + switch (rrty) { + case adns_r_a: + if ((pai->qu->flags & adns_qf_ipv6_mapv4) && + (pai->qu->answer->type & adns__qtf_bigaddr)) { + if (avail < 4) return adns_s_invaliddata; + memset(v6map.s6_addr + 0, 0x00, 10); + memset(v6map.s6_addr + 10, 0xff, 2); + memcpy(v6map.s6_addr + 12, oaddr, 4); + oaddr= v6map.s6_addr; avail= sizeof(v6map.s6_addr); + if (step < 0) step= 4; + goto aaaa; + } + af= AF_INET; addrlen= 4; + addrp= &storeto->addr.inet.sin_addr; + salen= sizeof(storeto->addr.inet); + break; + case adns_r_aaaa: + aaaa: + af= AF_INET6; addrlen= 16; + addrp= storeto->addr.inet6.sin6_addr.s6_addr; + salen= sizeof(storeto->addr.inet6); + break; + } + assert(addrp); + + assert(offsetof(adns_rr_addr, addr) + salen <= rrsz); + if (addrlen < avail) return adns_s_invaliddata; + if (step < 0) step= addrlen; + *cbyte_io += step; + memset(&storeto->addr, 0, salen); + storeto->len= salen; + storeto->addr.sa.sa_family= af; + memcpy(addrp, oaddr, addrlen); - if (max-cbyte != 4) return adns_s_invaliddata; - storeto->len= sizeof(storeto->addr.inet); - memset(&storeto->addr,0,sizeof(storeto->addr.inet)); - storeto->addr.inet.sin_family= AF_INET; - memcpy(&storeto->addr.inet.sin_addr,dgram+cbyte,4); + return adns_s_ok; +} + +static adns_status pa_addr(const parseinfo *pai, int cbyte, + int max, void *datap) { + int err= pap_addr(pai, pai->qu->answer->type & adns_rrt_typemask, + pai->qu->answer->rrsz, &cbyte, max, datap); + if (err) return err; + if (cbyte != max) return adns_s_invaliddata; return adns_s_ok; } @@ -417,6 +514,228 @@ static int gsz_addr(const typeinfo *typei, adns_rrtype type) { sizeof(adns_rr_addr) : sizeof(adns_rr_addr_v4only); } +static unsigned addr_rrtypes(adns_state ads, adns_rrtype type, + adns_queryflags qf) { + /* Return a mask of addr_rf_... flags indicating which address families are + * wanted, given a query type and flags. + */ + return addr_rf_a; +} + +static void icb_addr(adns_query parent, adns_query child); + +static void addr_subqueries(adns_query qu, struct timeval now, + adns_queryflags qf_extra, + const byte *qd_dgram, int qd_dglen) { + int i, err, id; + adns_query cqu; + adns_queryflags qf= (qu->flags & ~adns_qf_search) | qf_extra; + adns_rrtype qtf= qu->answer->type & adns__qtf_deref; + unsigned which= qu->ctx.tinfo.addr.want & ~qu->ctx.tinfo.addr.have; + qcontext ctx; + + memset(&ctx, 0, sizeof(ctx)); + ctx.callback= icb_addr; + for (i=0; iads, &qu->vb, &id, qd_dgram,qd_dglen, + DNS_HDRSIZE, addr_all_rrtypes[i], qf); + if (err) goto x_error; + err= adns__internal_submit(qu->ads, &cqu, qu, &tinfo_addrsub, + addr_all_rrtypes[i] | qtf, + &qu->vb, id, qf, now, &ctx); + if (err) goto x_error; + cqu->answer->rrsz= qu->answer->rrsz; + } + qu->state= query_childw; + LIST_LINK_TAIL(qu->ads->childw, qu); + return; + +x_error: + adns__query_fail(qu, err); +} + +static adns_status addr_submit(adns_query parent, adns_query *query_r, + vbuf *qumsg_vb, int id, unsigned want, + adns_queryflags flags, struct timeval now, + qcontext *ctx) { + /* This is effectively a substitute for adns__internal_submit, intended for + * the case where the caller (possibly) only wants a subset of the + * available record types. The memory management and callback rules are + * the same as for adns__internal_submit. + * + * Some differences: the query is linked onto the parent's children list + * before exit (though the parent's state is not changed, and it is not + * linked into the childw list queue); and we fiddle with the `tinfo' + * portion of the context structure (yes, modifying *ctx), since this is, + * in fact, the main purpose of this function. + */ + + adns_state ads= parent->ads; + adns_query qu; + adns_status err; + adns_rrtype type= ((adns_r_addr & adns_rrt_reprmask) | + (parent->answer->type & ~adns_rrt_reprmask)); + + ctx->tinfo.addr.want= want; + ctx->tinfo.addr.have= 0; + err= adns__internal_submit(ads, &qu, parent, adns__findtype(adns_r_addr), + type, qumsg_vb, id, flags, now, ctx); + if (err) return err; + + *query_r= qu; + return adns_s_ok; +} + +static adns_status append_addrs(adns_query qu, size_t rrsz, + adns_rr_addr **dp, int *dlen, + const adns_rr_addr *sp, int slen) { + /* Append a vector of slen addr records, each of size rrsz, starting at ap, + * to a vector starting at *dp, of length *dlen. On successful completion, + * *dp and *dlen are updated. + */ + + size_t drrsz= *dlen*rrsz, srrsz= slen*rrsz; + byte *p; + + if (!slen) return adns_s_ok; + p= adns__alloc_interim(qu, drrsz + srrsz); + if (!p) R_NOMEM; + if (*dlen) { + memcpy(p, *dp, drrsz); + adns__free_interim(qu, *dp); + } + memcpy(p + drrsz, sp, srrsz); + *dlen += slen; + *dp= (adns_rr_addr *)p; + return adns_s_ok; +} + +static void propagate_ttl(adns_query to, adns_query from) + { if (to->expires > from->expires) to->expires= from->expires; } + +static adns_status copy_cname_from_child(adns_query parent, adns_query child) { + adns_answer *pans= parent->answer, *cans= child->answer; + size_t n= strlen(cans->cname) + 1; + + pans->cname= adns__alloc_preserved(parent, n); + if (!pans->cname) R_NOMEM; + memcpy(pans->cname, cans->cname, n); + return adns_s_ok; +} + +static void done_addr_type(adns_query qu, adns_rrtype type) { + unsigned f= addr_rrtypeflag(type); + assert(f); qu->ctx.tinfo.addr.have |= f; +} + +static void icb_addr(adns_query parent, adns_query child) { + adns_state ads= parent->ads; + adns_answer *pans= parent->answer, *cans= child->answer; + struct timeval now; + adns_status err; + adns_queryflags qf; + int id; + + propagate_ttl(parent, child); + + if (!(child->flags & adns__qf_addr_cname) && + (parent->flags & adns__qf_addr_answer) && + (!!pans->cname != !!cans->cname || + (pans->cname && strcmp(pans->cname, cans->cname)))) { + /* We've detected an inconsistency in CNAME records, and must deploy + * countermeasures. + */ + + if (!pans->cname) { + /* The child has a CNAME record, but the parent doesn't. We must + * discard all of the parent's addresses, and substitute the child's. + */ + + assert(pans->rrsz == cans->rrsz); + adns__free_interim(parent, pans->rrs.bytes); + adns__transfer_interim(child, parent, cans->rrs.bytes); + pans->rrs.bytes= cans->rrs.bytes; + pans->nrrs= cans->nrrs; + parent->ctx.tinfo.addr.have= 0; + done_addr_type(parent, cans->type); + err= copy_cname_from_child(parent, child); if (err) goto x_err; + } + + /* We've settled on the CNAME (now) associated with the parent, which + * already has appropriate address records. Build a query datagram for + * this name so that we can issue child queries for the missing address + * families. The child's vbuf looks handy for this. + */ + err= adns__mkquery(ads, &child->vb, &id, pans->cname, + strlen(pans->cname), &tinfo_addrsub, + adns_r_addr, parent->flags); + if (err) goto x_err; + + /* Now cancel the remaining children, and try again with the CNAME we've + * settled on. + */ + adns__cancel_children(parent); + if (gettimeofday(&now, 0)) goto x_gtod; + qf= adns__qf_addr_cname; + if (!(parent->flags & adns_qf_cname_loose)) qf |= adns_qf_cname_forbid; + addr_subqueries(parent, now, qf, child->vb.buf, child->vb.used); + return; + } + + if (cans->cname && !pans->cname) { + err= copy_cname_from_child(parent, child); + if (err) goto x_err; + } + + if ((parent->flags & adns_qf_search) && + !pans->cname && cans->status == adns_s_nxdomain) { + /* We're searching a list of suffixes, and the name doesn't exist. Try + * the next one. + */ + + adns__cancel_children(parent); + adns__free_interim(parent, pans->rrs.bytes); + pans->rrs.bytes= 0; pans->nrrs= 0; + if (gettimeofday(&now, 0)) goto x_gtod; + adns__search_next(ads, parent, now); + return; + } + + if (cans->status && cans->status != adns_s_nodata) + { err= cans->status; goto x_err; } + + assert(pans->rrsz == cans->rrsz); + err= append_addrs(parent, pans->rrsz, + &pans->rrs.addr, &pans->nrrs, + cans->rrs.addr, cans->nrrs); + if (err) goto x_err; + done_addr_type(parent, cans->type); + + if (parent->children.head) LIST_LINK_TAIL(ads->childw, parent); + else if (!pans->nrrs) adns__query_fail(parent, adns_s_nodata); + else adns__query_done(parent); + parent->flags |= adns__qf_addr_answer; + return; + +x_gtod: + adns__diag(ads, -1, parent, "gettimeofday failed: %s", strerror(errno)); + err= adns_s_systemfail; + goto x_err; + +x_err: + adns__query_fail(parent, err); +} + +static void qs_addr(adns_query qu, struct timeval now) { + if (!qu->ctx.tinfo.addr.want) { + qu->ctx.tinfo.addr.want= addr_rrtypes(qu->ads, qu->answer->type, + qu->flags); + qu->ctx.tinfo.addr.have= 0; + } + addr_subqueries(qu, now, 0, qu->query_dgram, qu->query_dglen); +} + /* * _domain (pap,csp,cs) * _dom_raw (pa) @@ -487,42 +806,45 @@ static adns_status pa_host_raw(const parseinfo *pai, int cbyte, */ static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha, - size_t addrsz, + unsigned *want_io, size_t addrsz, int *cbyte_io, int count, int dmstart) { int rri, naddrs; - int type, class, rdlen, rdstart, ownermatched; + unsigned typef, want= *want_io, need= want; + int type, class, rdlen, rdend, rdstart, ownermatched; unsigned long ttl; adns_status st; - for (rri=0, naddrs=-1; rriqu, pai->serv, pai->dgram, pai->dglen, cbyte_io, &type, &class, &ttl, &rdlen, &rdstart, pai->dgram, pai->dglen, dmstart, &ownermatched); if (st) return st; - if (!ownermatched || class != DNS_CLASS_IN || type != adns_r_a) { - if (naddrs>0) break; else continue; - } - if (naddrs == -1) { - naddrs= 0; - } - if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*addrsz)) - R_NOMEM; + if (!ownermatched || class != DNS_CLASS_IN) continue; + typef= addr_rrtypeflag(type); + if (!(want & typef)) continue; + need &= ~typef; + if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*addrsz)) R_NOMEM; adns__update_expires(pai->qu,ttl,pai->now); - st= pa_addr(pai, rdstart,rdstart+rdlen, pai->qu->vb.buf + naddrs*addrsz); + rdend= rdstart + rdlen; + st= pap_addr(pai, type, addrsz, &rdstart, rdend, + (adns_rr_addr *)(pai->qu->vb.buf + naddrs*addrsz)); if (st) return st; + if (rdstart != rdend) return adns_s_invaliddata; naddrs++; } - if (naddrs >= 0) { - ha->addrs= adns__alloc_interim(pai->qu, naddrs*addrsz); - if (!ha->addrs) R_NOMEM; - memcpy(ha->addrs, pai->qu->vb.buf, naddrs*addrsz); - ha->naddrs= naddrs; + if (naddrs > 0) { + st= append_addrs(pai->qu, addrsz, &ha->addrs, &ha->naddrs, + (const adns_rr_addr *)pai->qu->vb.buf, naddrs); + if (st) return st; ha->astatus= adns_s_ok; - adns__isort(ha->addrs, naddrs, addrsz, pai->qu->vb.buf, - div_addr, pai->ads); + if (!need) { + adns__isort(ha->addrs, naddrs, addrsz, pai->qu->vb.buf, + div_addr, pai->ads); + } } + *want_io= need; return adns_s_ok; } @@ -531,13 +853,31 @@ static void icb_hostaddr(adns_query parent, adns_query child) { adns_rr_hostaddr *rrp= child->ctx.pinfo.hostaddr; adns_state ads= parent->ads; adns_status st; + size_t addrsz= gsz_addr(0, parent->answer->type); + + st= cans->status == adns_s_nodata ? adns_s_ok : cans->status; + if (st) goto done; + propagate_ttl(parent, child); + + assert(addrsz == cans->rrsz); + st= append_addrs(parent, addrsz, + &rrp->addrs, &rrp->naddrs, + cans->rrs.addr, cans->nrrs); + if (st) goto done; + if (!rrp->naddrs) { st= adns_s_nodata; goto done; } + + if (!adns__vbuf_ensure(&parent->vb, addrsz)) + { st= adns_s_nomemory; goto done; } + adns__isort(rrp->addrs, rrp->naddrs, addrsz, parent->vb.buf, + div_addr, ads); + +done: + if (st) { + adns__free_interim(parent, rrp->addrs); + rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : 0; + } - st= cans->status; rrp->astatus= st; - rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : cans->nrrs; - rrp->addrs= cans->rrs.addr; - adns__transfer_interim(child, parent, rrp->addrs); - if (parent->children.head) { LIST_LINK_TAIL(ads->childw,parent); } else { @@ -553,6 +893,7 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, int id; adns_query nqu; adns_queryflags nflags; + unsigned want; size_t addrsz= gsz_addr(0, pai->qu->answer->type); dmstart= cbyte= *cbyte_io; @@ -562,18 +903,20 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, *cbyte_io= cbyte; rrp->astatus= adns_s_ok; - rrp->naddrs= -1; + rrp->naddrs= 0; rrp->addrs= 0; cbyte= pai->nsstart; - st= pap_findaddrs(pai, rrp,addrsz, &cbyte, pai->nscount, dmstart); + want= addr_rrtypes(pai->ads, pai->qu->answer->type, pai->qu->flags); + + st= pap_findaddrs(pai, rrp, &want, addrsz, &cbyte, pai->nscount, dmstart); if (st) return st; - if (rrp->naddrs != -1) return adns_s_ok; + if (!want) return adns_s_ok; - st= pap_findaddrs(pai, rrp,addrsz, &cbyte, pai->arcount, dmstart); + st= pap_findaddrs(pai, rrp, &want, addrsz, &cbyte, pai->arcount, dmstart); if (st) return st; - if (rrp->naddrs != -1) return adns_s_ok; + if (!want) return adns_s_ok; st= adns__mkquery_frdgram(pai->ads, &pai->qu->vb, &id, pai->dgram, pai->dglen, dmstart, @@ -583,16 +926,12 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, ctx.ext= 0; ctx.callback= icb_hostaddr; ctx.pinfo.hostaddr= rrp; - memset(&ctx.tinfo, 0, sizeof(ctx.tinfo)); - nflags= adns_qf_quoteok_query; + nflags= adns_qf_quoteok_query | (pai->qu->flags & adns_qf_ipv6_mapv4); if (!(pai->qu->flags & adns_qf_cname_loose)) nflags |= adns_qf_cname_forbid; - st= adns__internal_submit(pai->ads, &nqu, pai->qu, - adns__findtype(adns_r_addr), - ((adns_r_addr & adns_rrt_reprmask) | - (pai->qu->answer->type & ~adns_rrt_reprmask)), - &pai->qu->vb, id, nflags, pai->now, &ctx); + st= addr_submit(pai->qu, &nqu, &pai->qu->vb, id, want, + nflags, pai->now, &ctx); if (st) return st; return adns_s_ok; @@ -1309,7 +1648,7 @@ DEEP_TYPE(srv_raw,"SRV", "raw",srvraw , srvraw, srv, srvraw, .checklabel= ckl_srv, .postsort= postsort_srv), FLAT_TYPE(addr, "A", "addr", addr, addr, addr, addr, - .getrrsz= gsz_addr), + .getrrsz= gsz_addr, .query_send= qs_addr), DEEP_TYPE(ns, "NS", "+addr",hostaddr, hostaddr,hostaddr,hostaddr ), DEEP_TYPE(ptr, "PTR","checked",str, ptr, 0, domain, .checklabel= ckl_ptr), @@ -1321,6 +1660,10 @@ DEEP_TYPE(soa, "SOA","822", soa, soa, 0, soa ), DEEP_TYPE(rp, "RP", "822", strpair, rp, 0, rp ), }; +static const typeinfo tinfo_addrsub = +FLAT_TYPE(none, "","sub",addr, addr, 0, addr, + .getrrsz= gsz_addr); + static const typeinfo typeinfo_unknown= DEEP_TYPE(unknown,0, "unknown",byteblock,opaque, 0, opaque );