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

- Fix #870: NXDOMAIN instead of NOERROR rcode when asked for existing

Browse source 
CNAME record.
This commit is contained in:
W.C.A. Wijngaards 2023-04-04 10:06:16 +02:00
parent 312035f58a
commit c7618a9b80
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
4 April 2023: Wouter
- Fix #870: NXDOMAIN instead of NOERROR rcode when asked for existing
CNAME record.
24 March 2023: Philip 24 March 2023: Philip
- Fix issue #676: Unencrypted query is sent when - Fix issue #676: Unencrypted query is sent when
forward-tls-upstream: yes is used without tls-cert-bundle forward-tls-upstream: yes is used without tls-cert-bundle

9
iterator/iterator.c
View file

@ -2879,7 +2879,7 @@ static int
processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq, processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
struct iter_env* ie, int id) struct iter_env* ie, int id)
{ {
int dnsseclame = 0; int dnsseclame = 0, origtypecname = 0;
enum response_type type; enum response_type type;
iq->num_current_queries--; iq->num_current_queries--;
@ -2962,6 +2962,8 @@ 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)
origtypecname = 1;
if(type == RESPONSE_TYPE_CNAME && iq->response->rep->an_numrrsets >= 1 if(type == RESPONSE_TYPE_CNAME && iq->response->rep->an_numrrsets >= 1
&& ntohs(iq->response->rep->rrsets[0]->rk.type) == LDNS_RR_TYPE_DNAME) { && ntohs(iq->response->rep->rrsets[0]->rk.type) == LDNS_RR_TYPE_DNAME) {
uint8_t* sname = NULL; uint8_t* sname = NULL;
@ -3047,11 +3049,14 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
iq->minimisation_state = DONOT_MINIMISE_STATE; iq->minimisation_state = DONOT_MINIMISE_STATE;
} }
if(FLAGS_GET_RCODE(iq->response->rep->flags) == if(FLAGS_GET_RCODE(iq->response->rep->flags) ==
LDNS_RCODE_NXDOMAIN) { LDNS_RCODE_NXDOMAIN && !origtypecname) {
/* Stop resolving when NXDOMAIN is DNSSEC /* Stop resolving when NXDOMAIN is DNSSEC
* signed. Based on assumption that nameservers * signed. Based on assumption that nameservers
* serving signed zones do not return NXDOMAIN * serving signed zones do not return NXDOMAIN
* for empty-non-terminals. */ * for empty-non-terminals. */
/* If this response is actually a CNAME type,
* the nxdomain rcode may not be for the qname,
* and so it is not the final response. */
if(iq->dnssec_expected) if(iq->dnssec_expected)
return final_state(iq); return final_state(iq);
/* Make subrequest to validate intermediate /* Make subrequest to validate intermediate