mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Fix RPZ radix tree search() for CLIENT-IP triggers (#39481)

Browse Source
This commit is contained in:
Mukund Sivaraman
2015-05-21 11:09:29 +05:30
parent 9208b81867
commit 705cea35a8
8 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/dns/rpz.c
View File

@@ -827,7 +827,7 @@ name2ipkey(int log_level,
if (--ip_labels == 4 && !strchr(cp, 'z')) {
/*
* Convert an IPv4 address
* from the form "prefix.w.z.y.x"
* from the form "prefix.z.y.x.w"
*/
if (prefix_num > 32U) {
badname(log_level, src_name,
@@ -911,6 +911,12 @@ name2ipkey(int log_level,
prefix += DNS_RPZ_CIDR_WORD_BITS;
}
/*
* XXXMUKS: Should the following check be enabled in a
* production build? It can be expensive for large IP zones
* from 3rd parties.
*/
/*
* Convert the address back to a canonical domain name
* to ensure that the original name is in canonical form.
@@ -1093,7 +1099,7 @@ search(dns_rpz_zones_t *rpzs,
child->set.ip |= tgt_set->ip;
child->set.nsip |= tgt_set->nsip;
set_sum_pair(child);
*found = cur;
*found = child;
return (ISC_R_SUCCESS);
}
@@ -1186,8 +1192,8 @@ search(dns_rpz_zones_t *rpzs,
*/
find_result = DNS_R_PARTIALMATCH;
*found = cur;
set.client_ip = trim_zbits(set.ip,
cur->set.client_ip);
set.client_ip = trim_zbits(set.client_ip,
cur->set.client_ip);
set.ip = trim_zbits(set.ip,
cur->set.ip);
set.nsip = trim_zbits(set.nsip,