/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
FW3_OPT("__flags_v4", int, zone, flags[0]),
FW3_OPT("__flags_v6", int, zone, flags[1]),
+ FW3_LIST("__addrs", address, zone, old_addrs),
+
{ }
};
INIT_LIST_HEAD(&zone->masq_src);
INIT_LIST_HEAD(&zone->masq_dest);
+ INIT_LIST_HEAD(&zone->old_addrs);
+
zone->enabled = true;
zone->custom_chains = true;
zone->log_limit.rate = 10;
if (zone->masq)
{
- setbit(zone->flags[0], FW3_FLAG_SNAT);
+ fw3_setbit(zone->flags[0], FW3_FLAG_SNAT);
zone->conntrack = true;
}
if (zone->custom_chains)
{
- setbit(zone->flags[0], FW3_FLAG_SNAT);
- setbit(zone->flags[0], FW3_FLAG_DNAT);
+ fw3_setbit(zone->flags[0], FW3_FLAG_SNAT);
+ fw3_setbit(zone->flags[0], FW3_FLAG_DNAT);
}
- setbit(zone->flags[0], fw3_to_src_target(zone->policy_input));
- setbit(zone->flags[0], fw3_to_src_target(zone->policy_forward));
- setbit(zone->flags[0], zone->policy_output);
+ fw3_setbit(zone->flags[0], fw3_to_src_target(zone->policy_input));
+ fw3_setbit(zone->flags[0], zone->policy_forward);
+ fw3_setbit(zone->flags[0], zone->policy_output);
- setbit(zone->flags[1], fw3_to_src_target(zone->policy_input));
- setbit(zone->flags[1], fw3_to_src_target(zone->policy_forward));
- setbit(zone->flags[1], zone->policy_output);
+ fw3_setbit(zone->flags[1], fw3_to_src_target(zone->policy_input));
+ fw3_setbit(zone->flags[1], zone->policy_forward);
+ fw3_setbit(zone->flags[1], zone->policy_output);
list_add_tail(&zone->list, &state->zones);
}
continue;
if (c->flag &&
- !hasbit(zone->flags[handle->family == FW3_FAMILY_V6], c->flag))
+ !fw3_hasbit(zone->flags[handle->family == FW3_FAMILY_V6], c->flag))
continue;
fw3_ipt_create_chain(handle, c->format, zone->name);
int i;
const char *chains[] = {
- "input",
- "output",
- "forward",
+ "input", "INPUT",
+ "output", "OUTPUT",
+ "forward", "FORWARD",
};
#define jump_target(t) \
r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
fw3_ipt_rule_target(r, jump_target(t));
fw3_ipt_rule_extra(r, zone->extra_src);
+
+ if (t == FW3_FLAG_ACCEPT && !state->defaults.drop_invalid)
+ fw3_ipt_rule_extra(r,
+ "-m conntrack --ctstate NEW,UNTRACKED");
+
fw3_ipt_rule_replace(r, "zone_%s_src_%s", zone->name,
fw3_flag_names[t]);
}
r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub);
fw3_ipt_rule_target(r, jump_target(t));
fw3_ipt_rule_extra(r, zone->extra_dest);
+
+ if (t == FW3_FLAG_ACCEPT && !state->defaults.drop_invalid)
+ fw3_ipt_rule_extra(r,
+ "-m conntrack --ctstate NEW,UNTRACKED");
+
fw3_ipt_rule_replace(r, "zone_%s_dest_%s", zone->name,
fw3_flag_names[t]);
}
}
- for (i = 0; i < sizeof(chains)/sizeof(chains[0]); i++)
+ for (i = 0; i < sizeof(chains)/sizeof(chains[0]); i += 2)
{
if (*chains[i] == 'o')
r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub);
else
fw3_ipt_rule_extra(r, zone->extra_src);
- fw3_ipt_rule_replace(r, "delegate_%s", chains[i]);
+ fw3_ipt_rule_replace(r, chains[i + 1]);
}
}
else if (handle->table == FW3_TABLE_NAT)
r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
fw3_ipt_rule_target(r, "zone_%s_prerouting", zone->name);
fw3_ipt_rule_extra(r, zone->extra_src);
- fw3_ipt_rule_replace(r, "delegate_prerouting");
+ fw3_ipt_rule_replace(r, "PREROUTING");
}
if (has(zone->flags, handle->family, FW3_FLAG_SNAT))
r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub);
fw3_ipt_rule_target(r, "zone_%s_postrouting", zone->name);
fw3_ipt_rule_extra(r, zone->extra_dest);
- fw3_ipt_rule_replace(r, "delegate_postrouting");
+ fw3_ipt_rule_replace(r, "POSTROUTING");
}
}
else if (handle->table == FW3_TABLE_MANGLE)
fw3_ipt_rule_comment(r, "%s (mtu_fix logging)", zone->name);
fw3_ipt_rule_target(r, "LOG");
fw3_ipt_rule_addarg(r, false, "--log-prefix", buf);
- fw3_ipt_rule_replace(r, "mssfix");
+ fw3_ipt_rule_replace(r, "FORWARD");
}
r = fw3_ipt_rule_create(handle, &tcp, NULL, dev, NULL, sub);
fw3_ipt_rule_comment(r, "%s (mtu_fix)", zone->name);
fw3_ipt_rule_target(r, "TCPMSS");
fw3_ipt_rule_addarg(r, false, "--clamp-mss-to-pmtu", NULL);
- fw3_ipt_rule_replace(r, "mssfix");
+ fw3_ipt_rule_replace(r, "FORWARD");
}
}
else if (handle->table == FW3_TABLE_RAW)
r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
fw3_ipt_rule_target(r, "zone_%s_notrack", zone->name);
fw3_ipt_rule_extra(r, zone->extra_src);
- fw3_ipt_rule_replace(r, "delegate_notrack");
+ fw3_ipt_rule_replace(r, "PREROUTING");
}
}
}
}
}
+static struct fw3_address *
+next_addr(struct fw3_address *addr, struct list_head *list,
+ enum fw3_family family, bool invert)
+{
+ struct list_head *p;
+ struct fw3_address *rv;
+
+ for (p = addr ? addr->list.next : list->next; p != list; p = p->next)
+ {
+ rv = list_entry(p, struct fw3_address, list);
+
+ if (fw3_is_family(rv, family) && rv->invert == invert)
+ return rv;
+ }
+
+ return NULL;
+}
+
static void
print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
bool reload, struct fw3_zone *zone)
{
bool disable_notrack = state->defaults.drop_invalid;
+ bool first_src, first_dest;
struct fw3_address *msrc;
struct fw3_address *mdest;
struct fw3_ipt_rule *r;
fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
r = fw3_ipt_rule_new(handle);
- fw3_ipt_rule_target(r, "zone_%s_src_%s", zone->name,
+ fw3_ipt_rule_target(r, "zone_%s_dest_%s", zone->name,
fw3_flag_names[zone->policy_forward]);
fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
case FW3_TABLE_NAT:
if (zone->masq && handle->family == FW3_FAMILY_V4)
{
- fw3_foreach(msrc, &zone->masq_src)
- fw3_foreach(mdest, &zone->masq_dest)
+ /* for any negated masq_src ip, emit -s addr -j RETURN rules */
+ for (msrc = NULL;
+ (msrc = next_addr(msrc, &zone->masq_src,
+ handle->family, true)) != NULL; )
{
- if (!fw3_is_family(msrc, handle->family) ||
- !fw3_is_family(mdest, handle->family))
- continue;
+ msrc->invert = false;
+ r = fw3_ipt_rule_new(handle);
+ fw3_ipt_rule_src_dest(r, msrc, NULL);
+ fw3_ipt_rule_target(r, "RETURN");
+ fw3_ipt_rule_append(r, "zone_%s_postrouting", zone->name);
+ msrc->invert = true;
+ }
+ /* for any negated masq_dest ip, emit -d addr -j RETURN rules */
+ for (mdest = NULL;
+ (mdest = next_addr(mdest, &zone->masq_dest,
+ handle->family, true)) != NULL; )
+ {
+ mdest->invert = false;
r = fw3_ipt_rule_new(handle);
- fw3_ipt_rule_src_dest(r, msrc, mdest);
- fw3_ipt_rule_target(r, "MASQUERADE");
+ fw3_ipt_rule_src_dest(r, NULL, mdest);
+ fw3_ipt_rule_target(r, "RETURN");
fw3_ipt_rule_append(r, "zone_%s_postrouting", zone->name);
+ mdest->invert = true;
+ }
+
+ /* emit masquerading entries for non-negated addresses
+ and ensure that both src and dest loops run at least once,
+ even if there are no relevant addresses */
+ for (first_src = true, msrc = NULL;
+ (msrc = next_addr(msrc, &zone->masq_src,
+ handle->family, false)) || first_src;
+ first_src = false)
+ {
+ for (first_dest = true, mdest = NULL;
+ (mdest = next_addr(mdest, &zone->masq_dest,
+ handle->family, false)) || first_dest;
+ first_dest = false)
+ {
+ r = fw3_ipt_rule_new(handle);
+ fw3_ipt_rule_src_dest(r, msrc, mdest);
+ fw3_ipt_rule_target(r, "MASQUERADE");
+ fw3_ipt_rule_append(r, "zone_%s_postrouting", zone->name);
+ }
}
}
break;
list_for_each_entry(z, &state->zones, list)
{
- if (add != hasbit(z->flags[0], FW3_FLAG_HOTPLUG))
+ if (add != fw3_hasbit(z->flags[0], FW3_FLAG_HOTPLUG))
{
list_for_each_entry(d, &z->devices, list)
fw3_hotplug(add, z, d);
if (add)
- setbit(z->flags[0], FW3_FLAG_HOTPLUG);
+ fw3_setbit(z->flags[0], FW3_FLAG_HOTPLUG);
else
- delbit(z->flags[0], FW3_FLAG_HOTPLUG);
+ fw3_delbit(z->flags[0], FW3_FLAG_HOTPLUG);
}
}
}
}
struct list_head *
-fw3_resolve_zone_addresses(struct fw3_zone *zone)
+fw3_resolve_zone_addresses(struct fw3_zone *zone, struct fw3_address *addr)
{
struct fw3_device *net;
- struct fw3_address *addr, *tmp;
+ struct fw3_address *cur, *tmp;
struct list_head *all;
all = calloc(1, sizeof(*all));
INIT_LIST_HEAD(all);
- list_for_each_entry(net, &zone->networks, list)
- fw3_ubus_address(all, net->name);
-
- list_for_each_entry(addr, &zone->subnets, list)
+ if (addr && addr->set)
{
tmp = malloc(sizeof(*tmp));
- if (!tmp)
- continue;
+ if (tmp)
+ {
+ *tmp = *addr;
+ list_add_tail(&tmp->list, all);
+ }
+ }
+ else
+ {
+ list_for_each_entry(net, &zone->networks, list)
+ fw3_ubus_address(all, net->name);
- memcpy(tmp, addr, sizeof(*tmp));
- list_add_tail(&tmp->list, all);
+ list_for_each_entry(cur, &zone->subnets, list)
+ {
+ tmp = malloc(sizeof(*tmp));
+
+ if (!tmp)
+ continue;
+
+ *tmp = *cur;
+ list_add_tail(&tmp->list, all);
+ }
}
return all;
projects / project / firewall3.git / blobdiff