mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-17 19:31:09 +00:00
auth-zone: allow to exclude ip addresses from answer.
This commit is contained in:
1 parent
bf4e62c19e
commit
094bfaeb4f
4 files changed
+60
-21
No files matched your search
+5
-1
@@ -739,7 +739,7 @@ a return code of SERVFAIL. Note that
|
|||||||
setting this may affect DNS behaviour in bad ways, it is not an
|
setting this may affect DNS behaviour in bad ways, it is not an
|
||||||
extra-logging flag and should not be set in production.
|
extra-logging flag and should not be set in production.
|
||||||
.TP
|
.TP
|
||||||
.B --auth-zone=<domain>[,<subnet>[/<prefix length>][,<subnet>[/<prefix length>].....]]
|
.B --auth-zone=<domain>[,<subnet>[/<prefix length>][,<subnet>[/<prefix length>].....][,exclude:<subnet>[/<prefix length>]].....]
|
||||||
Define a DNS zone for which dnsmasq acts as authoritative server. Locally defined DNS records which are in the domain
|
Define a DNS zone for which dnsmasq acts as authoritative server. Locally defined DNS records which are in the domain
|
||||||
will be served. If subnet(s) are given, A and AAAA records must be in one of the
|
will be served. If subnet(s) are given, A and AAAA records must be in one of the
|
||||||
specified subnets.
|
specified subnets.
|
||||||
@@ -756,6 +756,10 @@ appear in the zone, but RFC1918 IPv4 addresses which should not.
|
|||||||
Interface-name and address-literal subnet specifications may be used
|
Interface-name and address-literal subnet specifications may be used
|
||||||
freely in the same --auth-zone declaration.
|
freely in the same --auth-zone declaration.
|
||||||
|
|
||||||
|
It's possible to exclude certain IP addresses from responses. It can be
|
||||||
|
used, to make sure that answers contain only global routeable IP
|
||||||
|
addresses (by excluding loopback, RFC1918 and ULA addresses).
|
||||||
|
|
||||||
The subnet(s) are also used to define in-addr.arpa and
|
The subnet(s) are also used to define in-addr.arpa and
|
||||||
ip6.arpa domains which are served for reverse-DNS queries. If not
|
ip6.arpa domains which are served for reverse-DNS queries. If not
|
||||||
specified, the prefix length defaults to 24 for IPv4 and 64 for IPv6.
|
specified, the prefix length defaults to 24 for IPv4 and 64 for IPv6.
|
||||||
|
|||||||
+35
-18
@@ -18,36 +18,53 @@
|
|||||||
|
|
||||||
#ifdef HAVE_AUTH
|
#ifdef HAVE_AUTH
|
||||||
|
|
||||||
static struct addrlist *find_subnet(struct auth_zone *zone, int flag, struct all_addr *addr_u)
|
static struct addrlist *find_addrlist(struct addrlist *list, int flag, struct all_addr *addr_u)
|
||||||
{
|
{
|
||||||
struct addrlist *subnet;
|
do {
|
||||||
|
if (!(list->flags & ADDRLIST_IPV6))
|
||||||
|
{
|
||||||
|
struct in_addr netmask, addr = addr_u->addr.addr4;
|
||||||
|
|
||||||
for (subnet = zone->subnet; subnet; subnet = subnet->next)
|
if (!(flag & F_IPV4))
|
||||||
{
|
continue;
|
||||||
if (!(subnet->flags & ADDRLIST_IPV6))
|
|
||||||
{
|
|
||||||
struct in_addr netmask, addr = addr_u->addr.addr4;
|
|
||||||
|
|
||||||
if (!(flag & F_IPV4))
|
netmask.s_addr = htonl(~(in_addr_t)0 << (32 - list->prefixlen));
|
||||||
continue;
|
|
||||||
|
|
||||||
netmask.s_addr = htonl(~(in_addr_t)0 << (32 - subnet->prefixlen));
|
if (is_same_net(addr, list->addr.addr.addr4, netmask))
|
||||||
|
return list;
|
||||||
if (is_same_net(addr, subnet->addr.addr.addr4, netmask))
|
}
|
||||||
return subnet;
|
|
||||||
}
|
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
else if (is_same_net6(&(addr_u->addr.addr6), &subnet->addr.addr.addr6, subnet->prefixlen))
|
else if (is_same_net6(&(addr_u->addr.addr6), &list->addr.addr.addr6, list->prefixlen))
|
||||||
return subnet;
|
return list;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
} while ((list = list->next));
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct addrlist *find_subnet(struct auth_zone *zone, int flag, struct all_addr *addr_u)
|
||||||
|
{
|
||||||
|
if (!zone->subnet)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
return find_addrlist(zone->subnet, flag, addr_u);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct addrlist *find_exclude(struct auth_zone *zone, int flag, struct all_addr *addr_u)
|
||||||
|
{
|
||||||
|
if (!zone->exclude)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
return find_addrlist(zone->exclude, flag, addr_u);
|
||||||
|
}
|
||||||
|
|
||||||
static int filter_zone(struct auth_zone *zone, int flag, struct all_addr *addr_u)
|
static int filter_zone(struct auth_zone *zone, int flag, struct all_addr *addr_u)
|
||||||
{
|
{
|
||||||
/* No zones specified, no filter */
|
if (find_exclude(zone, flag, addr_u))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* No subnets specified, no filter */
|
||||||
if (!zone->subnet)
|
if (!zone->subnet)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
|
|||||||
@@ -340,6 +340,7 @@ struct auth_zone {
|
|||||||
struct auth_name_list *next;
|
struct auth_name_list *next;
|
||||||
} *interface_names;
|
} *interface_names;
|
||||||
struct addrlist *subnet;
|
struct addrlist *subnet;
|
||||||
|
struct addrlist *exclude;
|
||||||
struct auth_zone *next;
|
struct auth_zone *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+19
-2
@@ -1906,6 +1906,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
new = opt_malloc(sizeof(struct auth_zone));
|
new = opt_malloc(sizeof(struct auth_zone));
|
||||||
new->domain = opt_string_alloc(arg);
|
new->domain = opt_string_alloc(arg);
|
||||||
new->subnet = NULL;
|
new->subnet = NULL;
|
||||||
|
new->exclude = NULL;
|
||||||
new->interface_names = NULL;
|
new->interface_names = NULL;
|
||||||
new->next = daemon->auth_zones;
|
new->next = daemon->auth_zones;
|
||||||
daemon->auth_zones = new;
|
daemon->auth_zones = new;
|
||||||
@@ -1913,6 +1914,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
while ((arg = comma))
|
while ((arg = comma))
|
||||||
{
|
{
|
||||||
int prefixlen = 0;
|
int prefixlen = 0;
|
||||||
|
int is_exclude = 0;
|
||||||
char *prefix;
|
char *prefix;
|
||||||
struct addrlist *subnet = NULL;
|
struct addrlist *subnet = NULL;
|
||||||
struct all_addr addr;
|
struct all_addr addr;
|
||||||
@@ -1923,6 +1925,12 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
if (prefix && !atoi_check(prefix, &prefixlen))
|
if (prefix && !atoi_check(prefix, &prefixlen))
|
||||||
ret_err(gen_err);
|
ret_err(gen_err);
|
||||||
|
|
||||||
|
if (strstr(arg, "exclude:") == arg)
|
||||||
|
{
|
||||||
|
is_exclude = 1;
|
||||||
|
arg = arg+8;
|
||||||
|
}
|
||||||
|
|
||||||
if (inet_pton(AF_INET, arg, &addr.addr.addr4))
|
if (inet_pton(AF_INET, arg, &addr.addr.addr4))
|
||||||
{
|
{
|
||||||
subnet = opt_malloc(sizeof(struct addrlist));
|
subnet = opt_malloc(sizeof(struct addrlist));
|
||||||
@@ -1960,8 +1968,17 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
if (subnet)
|
if (subnet)
|
||||||
{
|
{
|
||||||
subnet->addr = addr;
|
subnet->addr = addr;
|
||||||
subnet->next = new->subnet;
|
|
||||||
new->subnet = subnet;
|
if (is_exclude)
|
||||||
|
{
|
||||||
|
subnet->next = new->exclude;
|
||||||
|
new->exclude = subnet;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
subnet->next = new->subnet;
|
||||||
|
new->subnet = subnet;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in new issue
Block a user