X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=fe507b0d82b7fc784aeb27ab057a93739e3e0e86;hp=11ec56979aaceec7c1f1d43c332bf65724d5651e;hb=d1a450f7f29b68c314b92cde4f8cd34d4766302b;hpb=6b27a6665c288937eb5028063064e3350dcab545

diff --git a/zones.c b/zones.c
index 11ec569..fe507b0 100644
--- a/zones.c
+++ b/zones.c
@@ -23,7 +23,7 @@
 #define C(f, tbl, tgt, fmt) \
 	{ FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_FLAG_##tgt, fmt }
 
-static const struct fw3_rule_spec zone_chains[] = {
+static const struct fw3_chain_spec zone_chains[] = {
 	C(ANY, FILTER, UNSPEC,        "zone_%s_input"),
 	C(ANY, FILTER, UNSPEC,        "zone_%s_output"),
 	C(ANY, FILTER, UNSPEC,        "zone_%s_forward"),
@@ -39,6 +39,8 @@ static const struct fw3_rule_spec zone_chains[] = {
 	C(V4,  NAT,    SNAT,          "zone_%s_postrouting"),
 	C(V4,  NAT,    DNAT,          "zone_%s_prerouting"),
 
+	C(ANY, RAW,    NOTRACK,       "zone_%s_notrack"),
+
 	C(ANY, FILTER, CUSTOM_CHAINS, "input_%s_rule"),
 	C(ANY, FILTER, CUSTOM_CHAINS, "output_%s_rule"),
 	C(ANY, FILTER, CUSTOM_CHAINS, "forwarding_%s_rule"),
@@ -189,6 +191,16 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
 			continue;
 		}
 
+		if (strlen(zone->name) > FW3_ZONE_MAXNAMELEN)
+		{
+			warn_elem(e, "must not have a name longer than %u characters",
+			             FW3_ZONE_MAXNAMELEN);
+			fw3_free_zone(zone);
+			continue;
+		}
+
+		fw3_ubus_zone_devices(zone);
+
 		if (list_empty(&zone->networks) && list_empty(&zone->devices) &&
 		    list_empty(&zone->subnets) && !zone->extra_src)
 		{
@@ -214,12 +226,12 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
 		}
 
 		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);
-		setbit(zone->flags[0], zone->policy_forward);
 
 		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);
-		setbit(zone->flags[1], zone->policy_forward);
 
 		list_add_tail(&zone->list, &state->zones);
 	}
@@ -232,7 +244,7 @@ print_zone_chain(struct fw3_ipt_handle *handle, struct fw3_state *state,
 {
 	int i;
 	struct fw3_ipt_rule *r;
-	const struct fw3_rule_spec *c;
+	const struct fw3_chain_spec *c;
 
 	const char *flt_chains[] = {
 		"input",   "input",
@@ -309,7 +321,6 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 					 bool reload, struct fw3_zone *zone,
                      struct fw3_device *dev, struct fw3_address *sub)
 {
-	bool disable_notrack = state->defaults.drop_invalid;
 	struct fw3_protocol tcp = { .protocol = 6 };
 	struct fw3_ipt_rule *r;
 	enum fw3_flag t;
@@ -336,8 +347,8 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 				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);
-				fw3_ipt_rule_append(r, "zone_%s_src_%s", zone->name,
-				                    fw3_flag_names[t]);
+				fw3_ipt_rule_replace(r, "zone_%s_src_%s", zone->name,
+				                     fw3_flag_names[t]);
 			}
 
 			if (has(zone->flags, handle->family, t))
@@ -345,8 +356,8 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 				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);
-				fw3_ipt_rule_append(r, "zone_%s_dest_%s", zone->name,
-				                    fw3_flag_names[t]);
+				fw3_ipt_rule_replace(r, "zone_%s_dest_%s", zone->name,
+				                     fw3_flag_names[t]);
 			}
 		}
 
@@ -364,7 +375,7 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 			else
 				fw3_ipt_rule_extra(r, zone->extra_src);
 
-			fw3_ipt_rule_append(r, "delegate_%s", chains[i]);
+			fw3_ipt_rule_replace(r, "delegate_%s", chains[i]);
 		}
 	}
 	else if (handle->table == FW3_TABLE_NAT)
@@ -374,7 +385,7 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 			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_append(r, "delegate_prerouting");
+			fw3_ipt_rule_replace(r, "delegate_prerouting");
 		}
 
 		if (has(zone->flags, handle->family, FW3_FLAG_SNAT))
@@ -382,7 +393,7 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 			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_append(r, "delegate_postrouting");
+			fw3_ipt_rule_replace(r, "delegate_postrouting");
 		}
 	}
 	else if (handle->table == FW3_TABLE_MANGLE)
@@ -400,7 +411,7 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 				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_append(r, "mssfix");
+				fw3_ipt_rule_replace(r, "mssfix");
 			}
 
 			r = fw3_ipt_rule_create(handle, &tcp, NULL, dev, NULL, sub);
@@ -409,18 +420,17 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 			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_append(r, "mssfix");
+			fw3_ipt_rule_replace(r, "mssfix");
 		}
 	}
 	else if (handle->table == FW3_TABLE_RAW)
 	{
-		if (!zone->conntrack && !disable_notrack)
+		if (has(zone->flags, handle->family, FW3_FLAG_NOTRACK))
 		{
 			r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
-			fw3_ipt_rule_target(r, "CT");
-			fw3_ipt_rule_addarg(r, false, "--notrack", NULL);
+			fw3_ipt_rule_target(r, "zone_%s_notrack", zone->name);
 			fw3_ipt_rule_extra(r, zone->extra_src);
-			fw3_ipt_rule_append(r, "notrack");
+			fw3_ipt_rule_replace(r, "delegate_notrack");
 		}
 	}
 }
@@ -449,6 +459,7 @@ 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;
 	struct fw3_address *msrc;
 	struct fw3_address *mdest;
 	struct fw3_ipt_rule *r;
@@ -462,13 +473,28 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 	switch (handle->table)
 	{
 	case FW3_TABLE_FILTER:
+		if (has(zone->flags, handle->family, FW3_FLAG_DNAT))
+		{
+			r = fw3_ipt_rule_new(handle);
+			fw3_ipt_rule_extra(r, "-m conntrack --ctstate DNAT");
+			fw3_ipt_rule_comment(r, "Accept port redirections");
+			fw3_ipt_rule_target(r, fw3_flag_names[FW3_FLAG_ACCEPT]);
+			fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
+
+			r = fw3_ipt_rule_new(handle);
+			fw3_ipt_rule_extra(r, "-m conntrack --ctstate DNAT");
+			fw3_ipt_rule_comment(r, "Accept port forwards");
+			fw3_ipt_rule_target(r, fw3_flag_names[FW3_FLAG_ACCEPT]);
+			fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
+		}
+
 		r = fw3_ipt_rule_new(handle);
 		fw3_ipt_rule_target(r, "zone_%s_src_%s", zone->name,
 		                     fw3_flag_names[zone->policy_input]);
 		fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
 
 		r = fw3_ipt_rule_new(handle);
-		fw3_ipt_rule_target(r, "zone_%s_dest_%s", zone->name,
+		fw3_ipt_rule_target(r, "zone_%s_src_%s", zone->name,
 		                     fw3_flag_names[zone->policy_forward]);
 		fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
 
@@ -531,6 +557,15 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 		break;
 
 	case FW3_TABLE_RAW:
+		if (!zone->conntrack && !disable_notrack)
+		{
+			r = fw3_ipt_rule_new(handle);
+			fw3_ipt_rule_target(r, "CT");
+			fw3_ipt_rule_addarg(r, false, "--notrack", NULL);
+			fw3_ipt_rule_append(r, "zone_%s_notrack", zone->name);
+		}
+		break;
+
 	case FW3_TABLE_MANGLE:
 		break;
 	}
@@ -563,7 +598,7 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
                 bool reload)
 {
 	struct fw3_zone *z, *tmp;
-	const struct fw3_rule_spec *c;
+	const struct fw3_chain_spec *c;
 	char chain[32];
 
 	list_for_each_entry_safe(z, tmp, &state->zones, list)
@@ -574,7 +609,7 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
 		for (c = zone_chains; c->format; c++)
 		{
 			/* don't touch user chains on selective stop */
-			if (reload && hasbit(c->flag, FW3_FLAG_CUSTOM_CHAINS))
+			if (reload && c->flag == FW3_FLAG_CUSTOM_CHAINS)
 				continue;
 
 			if (!fw3_is_family(c, handle->family))
@@ -583,8 +618,17 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
 			if (c->table != handle->table)
 				continue;
 
+			if (c->flag && !has(z->flags, handle->family, c->flag))
+				continue;
+
 			snprintf(chain, sizeof(chain), c->format, z->name);
-			fw3_ipt_delete_rules(handle, chain);
+			fw3_ipt_flush_chain(handle, chain);
+
+			/* keep certain basic chains that do not depend on any settings to
+			   avoid purging unrelated user rules pointing to them */
+			if (reload && !c->flag)
+				continue;
+
 			fw3_ipt_delete_chain(handle, chain);
 		}
 
@@ -632,22 +676,47 @@ fw3_lookup_zone(struct fw3_state *state, const char *name)
 	return NULL;
 }
 
-void
-fw3_free_zone(struct fw3_zone *zone)
+struct list_head *
+fw3_resolve_zone_addresses(struct fw3_zone *zone)
 {
-	struct fw3_device *dev, *tmp;
+	struct fw3_device *net;
+	struct fw3_address *addr, *tmp;
+	struct list_head *addrs, *all;
+
+	all = malloc(sizeof(*all));
+
+	if (!all)
+		return NULL;
+
+	memset(all, 0, sizeof(*all));
+	INIT_LIST_HEAD(all);
 
-	list_for_each_entry_safe(dev, tmp, &zone->devices, list)
+	list_for_each_entry(net, &zone->networks, list)
 	{
-		list_del(&dev->list);
-		free(dev);
+		addrs = fw3_ubus_address(net->name);
+
+		if (!addrs)
+			continue;
+
+		list_for_each_entry_safe(addr, tmp, addrs, list)
+		{
+			list_del(&addr->list);
+			list_add_tail(&addr->list, all);
+		}
+
+		free(addrs);
 	}
 
-	list_for_each_entry_safe(dev, tmp, &zone->networks, list)
+	list_for_each_entry(addr, &zone->subnets, list)
 	{
-		list_del(&dev->list);
-		free(dev);
+		tmp = malloc(sizeof(*tmp));
+
+		if (!tmp)
+			continue;
+
+		memcpy(tmp, addr, sizeof(*tmp));
+		list_add_tail(&tmp->list, all);
 	}
 
-	fw3_free_object(zone, fw3_zone_opts);
+	return all;
 }