Deleted Added
sdiff udiff text old ( 256281 ) new ( 269257 )
full compact
iter_priv.c (256281) iter_priv.c (269257)
1/*
2 * iterator/iter_priv.c - iterative resolver private address and domain store
3 *
4 * Copyright (c) 2008, NLnet Labs. All rights reserved.
5 *
6 * This software is open source.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 7 unchanged lines hidden (view full) ---

16 * this list of conditions and the following disclaimer in the documentation
17 * and/or other materials provided with the distribution.
18 *
19 * Neither the name of the NLNET LABS nor the names of its contributors may
20 * be used to endorse or promote products derived from this software without
21 * specific prior written permission.
22 *
23 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1/*
2 * iterator/iter_priv.c - iterative resolver private address and domain store
3 *
4 * Copyright (c) 2008, NLnet Labs. All rights reserved.
5 *
6 * This software is open source.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 7 unchanged lines hidden (view full) ---

16 * this list of conditions and the following disclaimer in the documentation
17 * and/or other materials provided with the distribution.
18 *
19 * Neither the name of the NLNET LABS nor the names of its contributors may
20 * be used to endorse or promote products derived from this software without
21 * specific prior written permission.
22 *
23 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
24 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
25 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
26 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
27 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33 * POSSIBILITY OF SUCH DAMAGE.
24 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
25 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
26 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27 * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
28 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
29 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
30 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
31 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
32 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
33 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */
35
36/**
37 * \file
38 *
39 * This file contains functions to assist the iterator module.
40 * Keep track of the private addresses and lookup fast.
41 */
42
43#include "config.h"
34 */
35
36/**
37 * \file
38 *
39 * This file contains functions to assist the iterator module.
40 * Keep track of the private addresses and lookup fast.
41 */
42
43#include "config.h"
44#include <ldns/dname.h>
45#include "iterator/iter_priv.h"
46#include "util/regional.h"
47#include "util/log.h"
48#include "util/config_file.h"
49#include "util/data/dname.h"
50#include "util/data/msgparse.h"
51#include "util/net_help.h"
52#include "util/storage/dnstree.h"
44#include "iterator/iter_priv.h"
45#include "util/regional.h"
46#include "util/log.h"
47#include "util/config_file.h"
48#include "util/data/dname.h"
49#include "util/data/msgparse.h"
50#include "util/net_help.h"
51#include "util/storage/dnstree.h"
52#include "ldns/str2wire.h"
53#include "ldns/sbuffer.h"
53
54struct iter_priv* priv_create(void)
55{
56 struct iter_priv* priv = (struct iter_priv*)calloc(1, sizeof(*priv));
57 if(!priv)
58 return NULL;
59 priv->region = regional_create();
60 if(!priv->region) {

--- 44 unchanged lines hidden (view full) ---

105}
106
107/** Read private-domain declarations from config */
108static int read_names(struct iter_priv* priv, struct config_file* cfg)
109{
110 /* parse names, report errors, insert into tree */
111 struct config_strlist* p;
112 struct name_tree_node* n;
54
55struct iter_priv* priv_create(void)
56{
57 struct iter_priv* priv = (struct iter_priv*)calloc(1, sizeof(*priv));
58 if(!priv)
59 return NULL;
60 priv->region = regional_create();
61 if(!priv->region) {

--- 44 unchanged lines hidden (view full) ---

106}
107
108/** Read private-domain declarations from config */
109static int read_names(struct iter_priv* priv, struct config_file* cfg)
110{
111 /* parse names, report errors, insert into tree */
112 struct config_strlist* p;
113 struct name_tree_node* n;
113 uint8_t* nm;
114 uint8_t* nm, *nmr;
114 size_t nm_len;
115 int nm_labs;
115 size_t nm_len;
116 int nm_labs;
116 ldns_rdf* rdf;
117
118 for(p = cfg->private_domain; p; p = p->next) {
119 log_assert(p->str);
117
118 for(p = cfg->private_domain; p; p = p->next) {
119 log_assert(p->str);
120 rdf = ldns_dname_new_frm_str(p->str);
121 if(!rdf) {
120 nm = sldns_str2wire_dname(p->str, &nm_len);
121 if(!nm) {
122 log_err("cannot parse private-domain: %s", p->str);
123 return 0;
124 }
122 log_err("cannot parse private-domain: %s", p->str);
123 return 0;
124 }
125 nm = ldns_rdf_data(rdf);
126 nm_labs = dname_count_size_labels(nm, &nm_len);
125 nm_labs = dname_count_size_labels(nm, &nm_len);
127 nm = (uint8_t*)regional_alloc_init(priv->region, nm, nm_len);
128 ldns_rdf_deep_free(rdf);
129 if(!nm) {
126 nmr = (uint8_t*)regional_alloc_init(priv->region, nm, nm_len);
127 free(nm);
128 if(!nmr) {
130 log_err("out of memory");
131 return 0;
132 }
133 n = (struct name_tree_node*)regional_alloc(priv->region,
134 sizeof(*n));
135 if(!n) {
136 log_err("out of memory");
137 return 0;
138 }
129 log_err("out of memory");
130 return 0;
131 }
132 n = (struct name_tree_node*)regional_alloc(priv->region,
133 sizeof(*n));
134 if(!n) {
135 log_err("out of memory");
136 return 0;
137 }
139 if(!name_tree_insert(&priv->n, n, nm, nm_len, nm_labs,
138 if(!name_tree_insert(&priv->n, n, nmr, nm_len, nm_labs,
140 LDNS_RR_CLASS_IN)) {
141 verbose(VERB_QUERY, "ignoring duplicate "
142 "private-domain: %s", p->str);
143 }
144 }
145 return 1;
146}
147

--- 35 unchanged lines hidden (view full) ---

183 * @param priv: structure for address storage.
184 * @param pkt: the packet (for compression ptrs).
185 * @param name: name to check.
186 * @param name_len: uncompressed length of the name to check.
187 * @param dclass: class to check.
188 * @return: true if the name is OK. false if unlisted.
189 */
190static int
139 LDNS_RR_CLASS_IN)) {
140 verbose(VERB_QUERY, "ignoring duplicate "
141 "private-domain: %s", p->str);
142 }
143 }
144 return 1;
145}
146

--- 35 unchanged lines hidden (view full) ---

182 * @param priv: structure for address storage.
183 * @param pkt: the packet (for compression ptrs).
184 * @param name: name to check.
185 * @param name_len: uncompressed length of the name to check.
186 * @param dclass: class to check.
187 * @return: true if the name is OK. false if unlisted.
188 */
189static int
191priv_lookup_name(struct iter_priv* priv, ldns_buffer* pkt,
190priv_lookup_name(struct iter_priv* priv, sldns_buffer* pkt,
192 uint8_t* name, size_t name_len, uint16_t dclass)
193{
194 size_t len;
195 uint8_t decomp[256];
196 int labs;
197 if(name_len >= sizeof(decomp))
198 return 0;
199 dname_pkt_copy(pkt, decomp, name);
200 labs = dname_count_size_labels(decomp, &len);
201 log_assert(name_len == len);
202 return name_tree_lookup(&priv->n, decomp, len, labs, dclass) != NULL;
203}
204
205size_t priv_get_mem(struct iter_priv* priv)
206{
207 if(!priv) return 0;
208 return sizeof(*priv) + regional_get_mem(priv->region);
209}
210
191 uint8_t* name, size_t name_len, uint16_t dclass)
192{
193 size_t len;
194 uint8_t decomp[256];
195 int labs;
196 if(name_len >= sizeof(decomp))
197 return 0;
198 dname_pkt_copy(pkt, decomp, name);
199 labs = dname_count_size_labels(decomp, &len);
200 log_assert(name_len == len);
201 return name_tree_lookup(&priv->n, decomp, len, labs, dclass) != NULL;
202}
203
204size_t priv_get_mem(struct iter_priv* priv)
205{
206 if(!priv) return 0;
207 return sizeof(*priv) + regional_get_mem(priv->region);
208}
209
211int priv_rrset_bad(struct iter_priv* priv, ldns_buffer* pkt,
210/** remove RR from msgparse RRset, return true if rrset is entirely bad */
211static int
212remove_rr(const char* str, sldns_buffer* pkt, struct rrset_parse* rrset,
213 struct rr_parse* prev, struct rr_parse** rr, struct sockaddr_storage* addr, socklen_t addrlen)
214{
215 if(verbosity >= VERB_QUERY && rrset->dname_len <= LDNS_MAX_DOMAINLEN && str) {
216 uint8_t buf[LDNS_MAX_DOMAINLEN+1];
217 dname_pkt_copy(pkt, buf, rrset->dname);
218 log_name_addr(VERB_QUERY, str, buf, addr, addrlen);
219 }
220 if(prev)
221 prev->next = (*rr)->next;
222 else rrset->rr_first = (*rr)->next;
223 if(rrset->rr_last == *rr)
224 rrset->rr_last = prev;
225 rrset->rr_count --;
226 rrset->size -= (*rr)->size;
227 /* rr struct still exists, but is unlinked, so that in the for loop
228 * the rr->next works fine to continue. */
229 return rrset->rr_count == 0;
230}
231
232int priv_rrset_bad(struct iter_priv* priv, sldns_buffer* pkt,
212 struct rrset_parse* rrset)
213{
214 if(priv->a.count == 0)
215 return 0; /* there are no blocked addresses */
216
217 /* see if it is a private name, that is allowed to have any */
218 if(priv_lookup_name(priv, pkt, rrset->dname, rrset->dname_len,
219 ntohs(rrset->rrset_class))) {
220 return 0;
221 } else {
222 /* so its a public name, check the address */
223 socklen_t len;
233 struct rrset_parse* rrset)
234{
235 if(priv->a.count == 0)
236 return 0; /* there are no blocked addresses */
237
238 /* see if it is a private name, that is allowed to have any */
239 if(priv_lookup_name(priv, pkt, rrset->dname, rrset->dname_len,
240 ntohs(rrset->rrset_class))) {
241 return 0;
242 } else {
243 /* so its a public name, check the address */
244 socklen_t len;
224 struct rr_parse* rr;
245 struct rr_parse* rr, *prev = NULL;
225 if(rrset->type == LDNS_RR_TYPE_A) {
226 struct sockaddr_storage addr;
227 struct sockaddr_in sa;
228
229 len = (socklen_t)sizeof(sa);
230 memset(&sa, 0, len);
231 sa.sin_family = AF_INET;
232 sa.sin_port = (in_port_t)htons(UNBOUND_DNS_PORT);
233 for(rr = rrset->rr_first; rr; rr = rr->next) {
246 if(rrset->type == LDNS_RR_TYPE_A) {
247 struct sockaddr_storage addr;
248 struct sockaddr_in sa;
249
250 len = (socklen_t)sizeof(sa);
251 memset(&sa, 0, len);
252 sa.sin_family = AF_INET;
253 sa.sin_port = (in_port_t)htons(UNBOUND_DNS_PORT);
254 for(rr = rrset->rr_first; rr; rr = rr->next) {
234 if(ldns_read_uint16(rr->ttl_data+4)
235 != INET_SIZE)
255 if(sldns_read_uint16(rr->ttl_data+4)
256 != INET_SIZE) {
257 prev = rr;
236 continue;
258 continue;
259 }
237 memmove(&sa.sin_addr, rr->ttl_data+4+2,
238 INET_SIZE);
239 memmove(&addr, &sa, len);
260 memmove(&sa.sin_addr, rr->ttl_data+4+2,
261 INET_SIZE);
262 memmove(&addr, &sa, len);
240 if(priv_lookup_addr(priv, &addr, len))
241 return 1;
263 if(priv_lookup_addr(priv, &addr, len)) {
264 if(remove_rr("sanitize: removing public name with private address", pkt, rrset, prev, &rr, &addr, len))
265 return 1;
266 continue;
267 }
268 prev = rr;
242 }
243 } else if(rrset->type == LDNS_RR_TYPE_AAAA) {
244 struct sockaddr_storage addr;
245 struct sockaddr_in6 sa;
246 len = (socklen_t)sizeof(sa);
247 memset(&sa, 0, len);
248 sa.sin6_family = AF_INET6;
249 sa.sin6_port = (in_port_t)htons(UNBOUND_DNS_PORT);
250 for(rr = rrset->rr_first; rr; rr = rr->next) {
269 }
270 } else if(rrset->type == LDNS_RR_TYPE_AAAA) {
271 struct sockaddr_storage addr;
272 struct sockaddr_in6 sa;
273 len = (socklen_t)sizeof(sa);
274 memset(&sa, 0, len);
275 sa.sin6_family = AF_INET6;
276 sa.sin6_port = (in_port_t)htons(UNBOUND_DNS_PORT);
277 for(rr = rrset->rr_first; rr; rr = rr->next) {
251 if(ldns_read_uint16(rr->ttl_data+4)
252 != INET6_SIZE)
278 if(sldns_read_uint16(rr->ttl_data+4)
279 != INET6_SIZE) {
280 prev = rr;
253 continue;
281 continue;
282 }
254 memmove(&sa.sin6_addr, rr->ttl_data+4+2,
255 INET6_SIZE);
256 memmove(&addr, &sa, len);
283 memmove(&sa.sin6_addr, rr->ttl_data+4+2,
284 INET6_SIZE);
285 memmove(&addr, &sa, len);
257 if(priv_lookup_addr(priv, &addr, len))
258 return 1;
286 if(priv_lookup_addr(priv, &addr, len)) {
287 if(remove_rr("sanitize: removing public name with private address", pkt, rrset, prev, &rr, &addr, len))
288 return 1;
289 continue;
290 }
291 prev = rr;
259 }
260 }
261 }
262 return 0;
263}
292 }
293 }
294 }
295 return 0;
296}