Storage for white listed servers

git-svn-id: file:///svn/unbound/branches/edns-subnet@2748 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/edns-subnet/edns-subnet.c b/edns-subnet/edns-subnet.c
new file mode 100644 (file)
index 0000000..234aa55
--- /dev/null
+++ b/edns-subnet/edns-subnet.c
@@ -0,0 +1,144 @@
+/*
+ * edns-subnet/edns-subnet.c - Storage for white listed servers
+ *
+ * Copyright (c) 2012, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * Keep track of the white listed servers for subnet option and lookup 
+ * fast.
+ */
+#include "config.h"
+#include "edns-subnet/edns-subnet.h"
+#include "util/regional.h"
+#include "util/log.h"
+#include "util/config_file.h"
+#include "util/net_help.h"
+
+struct ednssubnet_upstream* 
+upstream_create(void)
+{
+       struct ednssubnet_upstream* upstream = 
+               (struct ednssubnet_upstream*)calloc(1,
+               sizeof(struct ednssubnet_upstream));
+       if(!upstream)
+               return NULL;
+       upstream->region = regional_create();
+       if(!upstream->region) {
+               upstream_delete(upstream);
+               return NULL;
+       }
+       return upstream;
+}
+
+void 
+upstream_delete(struct ednssubnet_upstream* upstream)
+{
+       if(!upstream) 
+               return;
+       regional_destroy(upstream->region);
+       free(upstream);
+}
+
+/** insert new address into upstream structure */
+static int
+upstream_insert(struct ednssubnet_upstream* upstream, struct sockaddr_storage* addr, 
+       socklen_t addrlen, int net)
+{
+       struct addr_tree_node* node = (struct addr_tree_node*)regional_alloc(
+               upstream->region, sizeof(*node));
+       if(!node)
+               return 0;
+       if(!addr_tree_insert(&upstream->tree, node, addr, addrlen, net)) {
+               verbose(VERB_QUERY, "duplicate send-client-subnet address ignored.");
+       }
+       return 1;
+}
+
+/** apply edns-subnet string */
+static int
+upstream_str_cfg(struct ednssubnet_upstream* upstream, const char* str)
+{
+       struct sockaddr_storage addr;
+       int net;
+       socklen_t addrlen;
+       verbose(VERB_ALGO, "send-client-subnet: %s", str);
+       if(!netblockstrtoaddr(str, UNBOUND_DNS_PORT, &addr, &addrlen, &net)) {
+               log_err("cannot parse send-client-subnet netblock: %s", str);
+               return 0;
+       }
+       if(!upstream_insert(upstream, &addr, addrlen, net)) {
+               log_err("out of memory");
+               return 0;
+       }
+       return 1;
+}
+
+/** read client_subnet config */
+static int 
+read_upstream(struct ednssubnet_upstream* upstream, struct config_file* cfg)
+{
+       struct config_strlist* p;
+       for(p = cfg->client_subnet; p; p = p->next) {
+               log_assert(p->str);
+               if(!upstream_str_cfg(upstream, p->str))
+                       return 0;
+       }
+       return 1;
+}
+
+int 
+upstream_apply_cfg(struct ednssubnet_upstream* upstream, struct config_file* cfg)
+{
+       regional_free_all(upstream->region);
+       addr_tree_init(&upstream->tree);
+       if(!read_upstream(upstream, cfg))
+               return 0;
+       addr_tree_init_parents(&upstream->tree);
+       return 1;
+}
+
+int 
+upstream_lookup(struct ednssubnet_upstream* upstream, struct sockaddr_storage* addr,
+        socklen_t addrlen)
+{
+       return addr_tree_lookup(&upstream->tree, addr, addrlen) != NULL;
+}
+
+size_t 
+upstream_get_mem(struct ednssubnet_upstream* upstream)
+{
+       if(!upstream) return 0;
+       return sizeof(*upstream) + regional_get_mem(upstream->region);
+}

diff --git a/edns-subnet/edns-subnet.h b/edns-subnet/edns-subnet.h
new file mode 100644 (file)
index 0000000..cc76833
--- /dev/null
+++ b/edns-subnet/edns-subnet.h
@@ -0,0 +1,105 @@
+/*
+ * edns-subnet/edns-subnet.h - Storage for white listed servers
+ *
+ * Copyright (c) 2012, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * Keep track of the white listed servers for subnet option and lookup 
+ * fast.
+ */
+
+#ifndef EDNSSUBNET_EDNSSUBNET_H
+#define EDNSSUBNET_EDNSSUBNET_H
+#include "util/storage/dnstree.h"
+struct iter_env;
+struct config_file;
+struct regional;
+
+/** In use by the edns subnet option code*/
+#define IANA_ADDRFAM_IP4 1
+#define IANA_ADDRFAM_IP6 2
+
+/**
+ * ednssubnet_upstream structure
+ */
+struct ednssubnet_upstream {
+       /** regional for allocation */
+       struct regional* region;
+       /** 
+        * Tree of the address spans that are whitelisted.
+        * contents of type addr_tree_node. Each node is an address span 
+        * Unbound will append subnet option for.
+        */
+       rbtree_t tree;
+};
+
+/**
+ * Create ednssubnet_upstream structure 
+ * @return new structure or NULL on error.
+ */
+struct ednssubnet_upstream* upstream_create(void);
+
+/**
+ * Delete ednssubnet_upstream structure.
+ * @param upstream: to delete.
+ */
+void upstream_delete(struct ednssubnet_upstream* upstream);
+
+/**
+ * Process ednssubnet_upstream config.
+ * @param upstream: where to store.
+ * @param cfg: config options.
+ * @return 0 on error.
+ */
+int upstream_apply_cfg(struct ednssubnet_upstream* upstream, struct config_file* cfg);
+
+/**
+ * See if an address is blocked.
+ * @param upstream: structure for address storage.
+ * @param addr: address to check
+ * @param addrlen: length of addr.
+ * @return: true if the address is whitelisted for subnet option. 
+ */
+int upstream_lookup(struct ednssubnet_upstream* upstream, struct sockaddr_storage* addr,
+       socklen_t addrlen);
+
+/**
+ * Get memory used by ednssubnet_upstream structure.
+ * @param upstream: structure for address storage.
+ * @return bytes in use.
+ */
+size_t upstream_get_mem(struct ednssubnet_upstream* upstream);
+
+#endif /* EDNSSUBNET_EDNSSUBNET_H */