upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 08:39:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix that looped DNAMEs do not cause unbound to spend effort.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4055 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-03-16 14:32:58 +00:00
parent 2042facc8b
commit ca48de34e9
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -3,6 +3,7 @@
- Add trustanchor.unbound CH TXT that gets a response with a number - Add trustanchor.unbound CH TXT that gets a response with a number
of TXT RRs with a string like "example.com. 2345 1234" with of TXT RRs with a string like "example.com. 2345 1234" with
the trust anchors and their keytags. the trust anchors and their keytags.
- Fix that looped DNAMEs do not cause unbound to spend effort.
13 March 2017: Wouter 13 March 2017: Wouter
- testbound understands Deckard MATCH rcode question answer commands. - testbound understands Deckard MATCH rcode question answer commands.

11
iterator/iterator.c
View file

@ -2263,6 +2263,17 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
/* YXDOMAIN is a permanent error, no need to retry */ /* YXDOMAIN is a permanent error, no need to retry */
type = RESPONSE_TYPE_ANSWER; type = RESPONSE_TYPE_ANSWER;
} }
if(type == RESPONSE_TYPE_CNAME && iq->response->rep->an_numrrsets >= 1
&& ntohs(iq->response->rep->rrsets[0]->rk.type) == LDNS_RR_TYPE_DNAME) {
uint8_t* sname = NULL;
size_t snamelen = 0;
get_cname_target(iq->response->rep->rrsets[0], &sname,
&snamelen);
if(snamelen && dname_subdomain_c(sname, iq->response->rep->rrsets[0]->rk.dname)) {
/* DNAME to a subdomain loop; do not recurse */
type = RESPONSE_TYPE_ANSWER;
}
}
/* handle each of the type cases */ /* handle each of the type cases */
if(type == RESPONSE_TYPE_ANSWER) { if(type == RESPONSE_TYPE_ANSWER) {

5
testdata/iter_dname_insec.rpl vendored
View file

@ -691,9 +691,12 @@ STEP 220902 CHECK_ANSWER
ENTRY_BEGIN ENTRY_BEGIN
MATCH all MATCH all
REPLY QR RD RA DO REPLY QR RD RA DO
REPLY SERVFAIL REPLY NOERROR
SECTION QUESTION SECTION QUESTION
cyc.example.com. IN A cyc.example.com. IN A
SECTION ANSWER
example.com. 0 IN DNAME example.com.
cyc.example.com. 0 IN CNAME cyc.example.com.
ENTRY_END ENTRY_END
; ns1.example.com. ; ns1.example.com.