From: Pierre Lebleu <pme.lebleu@gmail.com>
Date: Thu, 4 May 2017 08:52:54 +0000 (+0200)
Subject: firewall3: add UBUS support for redirect sections
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=commitdiff_plain;h=0a7d36d8cf56f160b531f3db9f045e3f9315dd15

firewall3: add UBUS support for redirect sections

It gives the ability to create redirect rules via
procd services and netifd interface firewall data.

Signed-off-by: Pierre Lebleu <pme.lebleu@gmail.com>
---

diff --git a/main.c b/main.c
index e38963d..5888ab5 100644
--- a/main.c
+++ b/main.c
@@ -104,7 +104,7 @@ build_state(bool runtime)
 	fw3_load_ipsets(state, p);
 	fw3_load_zones(state, p);
 	fw3_load_rules(state, p, b.head);
-	fw3_load_redirects(state, p);
+	fw3_load_redirects(state, p, b.head);
 	fw3_load_snats(state, p, b.head);
 	fw3_load_forwards(state, p);
 	fw3_load_includes(state, p);
diff --git a/redirects.c b/redirects.c
index a657b6d..e651ddd 100644
--- a/redirects.c
+++ b/redirects.c
@@ -175,159 +175,201 @@ check_local(struct uci_element *e, struct fw3_redirect *redir,
 	return redir->local;
 }
 
-void
-fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
+static bool
+check_redirect(struct fw3_state *state, struct fw3_redirect *redir, struct uci_element *e)
 {
-	struct uci_section *s;
-	struct uci_element *e;
-	struct fw3_redirect *redir;
-
 	bool valid;
 
-	INIT_LIST_HEAD(&state->redirects);
+	if (!redir->enabled)
+		return false;
 
-	uci_foreach_element(&p->sections, e)
+	if (redir->src.invert)
 	{
-		s = uci_to_section(e);
+		warn_section("redirect", redir, e, "must not have an inverted source");
+		return false;
+	}
+	else if (redir->src.set && !redir->src.any &&
+			!(redir->_src = fw3_lookup_zone(state, redir->src.name)))
+	{
+		warn_section("redirect", redir, e, "refers to not existing zone '%s'",
+				redir->src.name);
+		return false;
+	}
+	else if (redir->dest.set && !redir->dest.any &&
+			!(redir->_dest = fw3_lookup_zone(state, redir->dest.name)))
+	{
+		warn_section("redirect", redir, e, "refers to not existing zone '%s'",
+				redir->dest.name);
+		return false;
+	}
+	else if (redir->ipset.set && state->disable_ipsets)
+	{
+		warn_section("redirect", redir, e, "skipped due to disabled ipset support",
+				redir->name);
+		return false;
+	}
+	else if (redir->ipset.set &&
+			!(redir->ipset.ptr = fw3_lookup_ipset(state, redir->ipset.name)))
+	{
+		warn_section("redirect", redir, e, "refers to unknown ipset '%s'", redir->name,
+				redir->ipset.name);
+		return false;
+	}
 
-		if (strcmp(s->type, "redirect"))
-			continue;
+	if (!check_families(e, redir))
+		return false;
 
-		redir = calloc(1, sizeof(*redir));
-		if (!redir)
-			continue;
+	if (redir->target == FW3_FLAG_UNSPEC)
+	{
+		warn_section("redirect", redir, e, "has no target specified, defaulting to DNAT");
+		redir->target = FW3_FLAG_DNAT;
+	}
+	else if (redir->target < FW3_FLAG_DNAT || redir->target > FW3_FLAG_SNAT)
+	{
+		warn_section("redirect", redir, e, "has invalid target specified, defaulting to DNAT");
+		redir->target = FW3_FLAG_DNAT;
+	}
 
-		INIT_LIST_HEAD(&redir->proto);
-		INIT_LIST_HEAD(&redir->mac_src);
+	valid = false;
 
-		redir->enabled = true;
-		redir->reflection = true;
+	if (redir->target == FW3_FLAG_DNAT)
+	{
+		if (redir->src.any)
+			warn_section("redirect", redir, e, "must not have source '*' for DNAT target");
+		else if (!redir->_src)
+			warn_section("redirect", redir, e, "has no source specified");
+		else
+		{
+			set(redir->_src->flags, FW3_FAMILY_V4, redir->target);
+			valid = true;
 
-		valid = false;
+			if (!check_local(e, redir, state) && !redir->dest.set &&
+					resolve_dest(e, redir, state))
+			{
+				warn_section("redirect", redir, e,
+						"does not specify a destination, assuming '%s'",
+						redir->dest.name);
+			}
 
-		if (!fw3_parse_options(redir, fw3_redirect_opts, s))
-		{
-			warn_elem(e, "skipped due to invalid options");
-			fw3_free_redirect(redir);
-			continue;
+			if (redir->reflection && redir->_dest && redir->_src->masq)
+			{
+				set(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG_ACCEPT);
+				set(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG_DNAT);
+				set(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG_SNAT);
+			}
 		}
-
-		if (!redir->enabled)
+	}
+	else
+	{
+		if (redir->dest.any)
+			warn_section("redirect", redir, e,
+					"must not have destination '*' for SNAT target");
+		else if (!redir->_dest)
+			warn_section("redirect", redir, e, "has no destination specified");
+		else if (!redir->ip_dest.set)
+			warn_section("redirect", redir, e, "has no src_dip option specified");
+		else if (!list_empty(&redir->mac_src))
+			warn_section("redirect", redir, e, "must not use 'src_mac' option for SNAT target");
+		else
 		{
-			fw3_free_redirect(redir);
-			continue;
+			set(redir->_dest->flags, FW3_FAMILY_V4, redir->target);
+			valid = true;
 		}
+	}
 
-		if (redir->src.invert)
-		{
-			warn_elem(e, "must not have an inverted source");
-			fw3_free_redirect(redir);
-			continue;
-		}
-		else if (redir->src.set && !redir->src.any &&
-		         !(redir->_src = fw3_lookup_zone(state, redir->src.name)))
-		{
-			warn_elem(e, "refers to not existing zone '%s'", redir->src.name);
-			fw3_free_redirect(redir);
+	if (list_empty(&redir->proto))
+	{
+		warn_section("redirect", redir, e, "does not specify a protocol, assuming TCP+UDP");
+		fw3_parse_protocol(&redir->proto, "tcpudp", true);
+	}
+
+	if (!valid)
+		return false;
+
+	if (!redir->port_redir.set)
+		redir->port_redir = redir->port_dest;
+
+	return true;
+}
+
+static struct fw3_redirect *
+fw3_alloc_redirect(struct fw3_state *state)
+{
+	struct fw3_redirect *redir;
+
+	redir = calloc(1, sizeof(*redir));
+	if (!redir)
+		return NULL;
+
+	INIT_LIST_HEAD(&redir->proto);
+	INIT_LIST_HEAD(&redir->mac_src);
+
+	redir->enabled = true;
+	redir->reflection = true;
+
+	list_add_tail(&redir->list, &state->redirects);
+
+	return redir;
+}
+
+void
+fw3_load_redirects(struct fw3_state *state, struct uci_package *p,
+		struct blob_attr *a)
+{
+	struct uci_section *s;
+	struct uci_element *e;
+	struct fw3_redirect *redir;
+	struct blob_attr *entry;
+	unsigned rem;
+
+	INIT_LIST_HEAD(&state->redirects);
+
+	blob_for_each_attr(entry, a, rem)
+	{
+		const char *type;
+		const char *name = "ubus redirect";
+
+		if (!fw3_attr_parse_name_type(entry, &name, &type))
 			continue;
-		}
-		else if (redir->dest.set && !redir->dest.any &&
-		         !(redir->_dest = fw3_lookup_zone(state, redir->dest.name)))
-		{
-			warn_elem(e, "refers to not existing zone '%s'", redir->dest.name);
-			fw3_free_redirect(redir);
+
+		if (strcmp(type, "redirect"))
 			continue;
-		}
-		else if (redir->ipset.set && state->disable_ipsets)
-		{
-			warn_elem(e, "skipped due to disabled ipset support");
-			fw3_free_redirect(redir);
+
+		redir = fw3_alloc_redirect(state);
+		if (!redir)
 			continue;
-		}
-		else if (redir->ipset.set &&
-		         !(redir->ipset.ptr = fw3_lookup_ipset(state, redir->ipset.name)))
+
+		if (!fw3_parse_blob_options(redir, fw3_redirect_opts, entry, name))
 		{
-			warn_elem(e, "refers to unknown ipset '%s'", redir->ipset.name);
+			warn_section("redirect", redir, NULL, "skipped due to invalid options");
 			fw3_free_redirect(redir);
 			continue;
 		}
 
-		if (!check_families(e, redir))
-		{
+		if (!check_redirect(state, redir, NULL))
 			fw3_free_redirect(redir);
-			continue;
-		}
+	}
 
-		if (redir->target == FW3_FLAG_UNSPEC)
-		{
-			warn_elem(e, "has no target specified, defaulting to DNAT");
-			redir->target = FW3_FLAG_DNAT;
-		}
-		else if (redir->target < FW3_FLAG_DNAT || redir->target > FW3_FLAG_SNAT)
-		{
-			warn_elem(e, "has invalid target specified, defaulting to DNAT");
-			redir->target = FW3_FLAG_DNAT;
-		}
+	uci_foreach_element(&p->sections, e)
+	{
+		s = uci_to_section(e);
 
-		if (redir->target == FW3_FLAG_DNAT)
-		{
-			if (redir->src.any)
-				warn_elem(e, "must not have source '*' for DNAT target");
-			else if (!redir->_src)
-				warn_elem(e, "has no source specified");
-			else
-			{
-				set(redir->_src->flags, FW3_FAMILY_V4, redir->target);
-				valid = true;
-
-				if (!check_local(e, redir, state) && !redir->dest.set &&
-				    resolve_dest(e, redir, state))
-				{
-					warn_elem(e, "does not specify a destination, assuming '%s'",
-					          redir->dest.name);
-				}
-
-				if (redir->reflection && redir->_dest && redir->_src->masq)
-				{
-					set(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG_ACCEPT);
-					set(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG_DNAT);
-					set(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG_SNAT);
-				}
-			}
-		}
-		else
-		{
-			if (redir->dest.any)
-				warn_elem(e, "must not have destination '*' for SNAT target");
-			else if (!redir->_dest)
-				warn_elem(e, "has no destination specified");
-			else if (!redir->ip_dest.set)
-				warn_elem(e, "has no src_dip option specified");
-			else if (!list_empty(&redir->mac_src))
-				warn_elem(e, "must not use 'src_mac' option for SNAT target");
-			else
-			{
-				set(redir->_dest->flags, FW3_FAMILY_V4, redir->target);
-				valid = true;
-			}
-		}
+		if (strcmp(s->type, "redirect"))
+			continue;
 
-		if (list_empty(&redir->proto))
-		{
-			warn_elem(e, "does not specify a protocol, assuming TCP+UDP");
-			fw3_parse_protocol(&redir->proto, "tcpudp", true);
-		}
+		redir = fw3_alloc_redirect(state);
+		if (!redir)
+			continue;
 
-		if (!valid)
+		if (!fw3_parse_options(redir, fw3_redirect_opts, s))
 		{
+			warn_elem(e, "skipped due to invalid options");
 			fw3_free_redirect(redir);
 			continue;
 		}
 
-		if (!redir->port_redir.set)
-			redir->port_redir = redir->port_dest;
-
-		list_add_tail(&redir->list, &state->redirects);
+		if (!check_redirect(state, redir, e))
+			fw3_free_redirect(redir);
 	}
 }
 
diff --git a/redirects.h b/redirects.h
index b52d8c3..ac625f4 100644
--- a/redirects.h
+++ b/redirects.h
@@ -27,11 +27,15 @@
 
 extern const struct fw3_option fw3_redirect_opts[];
 
-void fw3_load_redirects(struct fw3_state *state, struct uci_package *p);
+void fw3_load_redirects(struct fw3_state *state, struct uci_package *p,
+			struct blob_attr *a);
 void fw3_print_redirects(struct fw3_ipt_handle *handle,
                          struct fw3_state *state);
 
-#define fw3_free_redirect(redir) \
-	fw3_free_object(redir, fw3_redirect_opts)
+static inline void fw3_free_redirect(struct fw3_redirect *redir)
+{
+	list_del(&redir->list);
+	fw3_free_object(redir, fw3_redirect_opts);
+}
 
 #endif