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 #1278: Incomplete wildcard proof.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4218 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-06-12 10:11:28 +00:00
parent 998793998d
commit c4869780d1
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
12 June 2017: Wouter
- Fix #1278: Incomplete wildcard proof.
8 June 2017: Ralph 8 June 2017: Ralph
- Added domain name based ECS whitelist. - Added domain name based ECS whitelist.

15
services/cache/dns.c vendored
View file

@ -41,6 +41,7 @@
#include "config.h" #include "config.h"
#include "iterator/iter_delegpt.h" #include "iterator/iter_delegpt.h"
#include "validator/val_nsec.h" #include "validator/val_nsec.h"
#include "validator/val_utils.h"
#include "services/cache/dns.h" #include "services/cache/dns.h"
#include "services/cache/rrset.h" #include "services/cache/rrset.h"
#include "util/data/msgreply.h" #include "util/data/msgreply.h"
@ -755,10 +756,16 @@ dns_cache_lookup(struct module_env* env,
if( qtype != LDNS_RR_TYPE_DS && if( qtype != LDNS_RR_TYPE_DS &&
(rrset=rrset_cache_lookup(env->rrset_cache, qname, qnamelen, (rrset=rrset_cache_lookup(env->rrset_cache, qname, qnamelen,
LDNS_RR_TYPE_CNAME, qclass, 0, now, 0))) { LDNS_RR_TYPE_CNAME, qclass, 0, now, 0))) {
struct dns_msg* msg = rrset_msg(rrset, region, now, &k); uint8_t* wc = NULL;
if(msg) { /* if the rrset is not a wildcard expansion, with wcname */
lock_rw_unlock(&rrset->entry.lock); /* because, if we return that CNAME rrset on its own, it is
return msg; * missing the NSEC or NSEC3 proof */
if(!(val_rrset_wildcard(rrset, &wc) && wc != NULL)) {
struct dns_msg* msg = rrset_msg(rrset, region, now, &k);
if(msg) {
lock_rw_unlock(&rrset->entry.lock);
return msg;
}
} }
lock_rw_unlock(&rrset->entry.lock); lock_rw_unlock(&rrset->entry.lock);
} }