/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013-2018 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("direction", direction, rule, direction_out),
FW3_OPT("ipset", setmatch, rule, ipset),
+ FW3_OPT("helper", cthelper, rule, helper),
+ FW3_OPT("set_helper", cthelper, rule, set_helper),
FW3_LIST("proto", protocol, rule, proto),
return rule;
}
+static bool
+check_rule(struct fw3_state *state, struct fw3_rule *r, struct uci_element *e)
+{
+ if (!r->enabled)
+ return false;
+
+ if (r->src.invert || r->dest.invert)
+ {
+ warn_section("rule", r, e, "must not have inverted 'src' or 'dest' options");
+ return false;
+ }
+ else if (r->src.set && !r->src.any &&
+ !(r->_src = fw3_lookup_zone(state, r->src.name)))
+ {
+ warn_section("rule", r, e, "refers to not existing zone '%s'", r->src.name);
+ return false;
+ }
+ else if (r->dest.set && !r->dest.any &&
+ !(r->_dest = fw3_lookup_zone(state, r->dest.name)))
+ {
+ warn_section("rule", r, e, "refers to not existing zone '%s'", r->dest.name);
+ return false;
+ }
+ else if (r->ipset.set && state->disable_ipsets)
+ {
+ warn_section("rule", r, e, "skipped due to disabled ipset support");
+ return false;
+ }
+ else if (r->ipset.set &&
+ !(r->ipset.ptr = fw3_lookup_ipset(state, r->ipset.name)))
+ {
+ warn_section("rule", r, e, "refers to unknown ipset '%s'", r->ipset.name);
+ return false;
+ }
+ else if (r->helper.set &&
+ !(r->helper.ptr = fw3_lookup_cthelper(state, r->helper.name)))
+ {
+ warn_section("rule", r, e, "refers to unknown CT helper '%s'", r->helper.name);
+ return false;
+ }
+ else if (r->set_helper.set &&
+ !(r->set_helper.ptr = fw3_lookup_cthelper(state, r->set_helper.name)))
+ {
+ warn_section("rule", r, e, "refers to unknown CT helper '%s'", r->set_helper.name);
+ return false;
+ }
+
+ if (!r->_src && (r->target == FW3_FLAG_NOTRACK || r->target == FW3_FLAG_HELPER))
+ {
+ warn_section("rule", r, e, "is set to target %s but has no source assigned",
+ fw3_flag_names[r->target]);
+ return false;
+ }
+
+ if (!r->set_mark.set && !r->set_xmark.set &&
+ r->target == FW3_FLAG_MARK)
+ {
+ warn_section("rule", r, e, "is set to target MARK but specifies neither "
+ "'set_mark' nor 'set_xmark' option");
+ return false;
+ }
+
+ if (r->_dest && r->target == FW3_FLAG_MARK)
+ {
+ warn_section("rule", r, e, "must not specify 'dest' for MARK target");
+ return false;
+ }
+
+ if (r->set_mark.invert || r->set_xmark.invert)
+ {
+ warn_section("rule", r, e, "must not have inverted 'set_mark' or 'set_xmark'");
+ return false;
+ }
+
+ if (!r->set_helper.set && r->target == FW3_FLAG_HELPER)
+ {
+ warn_section("rule", r, e, "is set to target HELPER but specifies "
+ "no 'set_helper' option");
+ return false;
+ }
+
+ if (r->set_helper.invert && r->target == FW3_FLAG_HELPER)
+ {
+ warn_section("rule", r, e, "must not have inverted 'set_helper' option");
+ return false;
+ }
+
+ if (!r->_src && !r->_dest && !r->src.any && !r->dest.any)
+ {
+ warn_section("rule", r, e, "has neither a source nor a destination zone assigned "
+ "- assuming an output r");
+ }
+
+ if (list_empty(&r->proto))
+ {
+ warn_section("rule", r, e, "does not specify a protocol, assuming TCP+UDP");
+ fw3_parse_protocol(&r->proto, "tcpudp", true);
+ }
+
+ if (r->target == FW3_FLAG_UNSPEC)
+ {
+ warn_section("rule", r, e, "has no target specified, defaulting to REJECT");
+ r->target = FW3_FLAG_REJECT;
+ }
+ else if (r->target > FW3_FLAG_MARK)
+ {
+ warn_section("rule", r, e, "has invalid target specified, defaulting to REJECT");
+ r->target = FW3_FLAG_REJECT;
+ }
+
+ /* NB: r family... */
+ if (r->_dest)
+ {
+ fw3_setbit(r->_dest->flags[0], r->target);
+ fw3_setbit(r->_dest->flags[1], r->target);
+ }
+ else if (need_src_action_chain(r))
+ {
+ fw3_setbit(r->_src->flags[0], fw3_to_src_target(r->target));
+ fw3_setbit(r->_src->flags[1], fw3_to_src_target(r->target));
+ }
+
+ return true;
+}
+
void
fw3_load_rules(struct fw3_state *state, struct uci_package *p,
struct blob_attr *a)
{
struct uci_section *s;
struct uci_element *e;
- struct fw3_rule *rule, *n;
- struct blob_attr *entry, *opt;
- unsigned rem, orem;
+ struct fw3_rule *rule;
+ struct blob_attr *entry;
+ unsigned rem;
INIT_LIST_HEAD(&state->rules);
blob_for_each_attr(entry, a, rem) {
- const char *type = NULL;
- blobmsg_for_each_attr(opt, entry, orem)
- if (!strcmp(blobmsg_name(opt), "type"))
- type = blobmsg_get_string(opt);
+ const char *type;
+ const char *name = "ubus rule";
- if (!type || strcmp(type, "rule"))
+ if (!fw3_attr_parse_name_type(entry, &name, &type))
+ continue;
+
+ if (strcmp(type, "rule"))
continue;
if (!(rule = alloc_rule(state)))
continue;
- if (!fw3_parse_blob_options(rule, fw3_rule_opts, entry))
+ if (!fw3_parse_blob_options(rule, fw3_rule_opts, entry, name))
{
- fprintf(stderr, "ubus section skipped due to invalid options\n");
+ warn_section("rule", rule, NULL, "skipped due to invalid options");
fw3_free_rule(rule);
continue;
}
+
+ if (!check_rule(state, rule, NULL))
+ fw3_free_rule(rule);
}
uci_foreach_element(&p->sections, e)
fw3_free_rule(rule);
continue;
}
- }
-
- list_for_each_entry_safe(rule, n, &state->rules, list)
- {
- if (!rule->enabled)
- {
- fw3_free_rule(rule);
- continue;
- }
-
- if (rule->src.invert || rule->dest.invert)
- {
- warn_elem(e, "must not have inverted 'src' or 'dest' options");
- fw3_free_rule(rule);
- continue;
- }
- else if (rule->src.set && !rule->src.any &&
- !(rule->_src = fw3_lookup_zone(state, rule->src.name)))
- {
- warn_elem(e, "refers to not existing zone '%s'", rule->src.name);
- fw3_free_rule(rule);
- continue;
- }
- else if (rule->dest.set && !rule->dest.any &&
- !(rule->_dest = fw3_lookup_zone(state, rule->dest.name)))
- {
- warn_elem(e, "refers to not existing zone '%s'", rule->dest.name);
- fw3_free_rule(rule);
- continue;
- }
- else if (rule->ipset.set && state->disable_ipsets)
- {
- warn_elem(e, "skipped due to disabled ipset support");
- fw3_free_rule(rule);
- continue;
- }
- else if (rule->ipset.set &&
- !(rule->ipset.ptr = fw3_lookup_ipset(state, rule->ipset.name)))
- {
- warn_elem(e, "refers to unknown ipset '%s'", rule->ipset.name);
- fw3_free_rule(rule);
- continue;
- }
-
- if (!rule->_src && rule->target == FW3_FLAG_NOTRACK)
- {
- warn_elem(e, "is set to target NOTRACK but has no source assigned");
- fw3_free_rule(rule);
- continue;
- }
-
- if (!rule->set_mark.set && !rule->set_xmark.set &&
- rule->target == FW3_FLAG_MARK)
- {
- warn_elem(e, "is set to target MARK but specifies neither "
- "'set_mark' nor 'set_xmark' option");
- fw3_free_rule(rule);
- continue;
- }
-
- if (rule->_dest && rule->target == FW3_FLAG_MARK)
- {
- warn_elem(e, "must not specify 'dest' for MARK target");
- fw3_free_rule(rule);
- continue;
- }
- if (rule->set_mark.invert || rule->set_xmark.invert)
- {
- warn_elem(e, "must not have inverted 'set_mark' or 'set_xmark'");
+ if (!check_rule(state, rule, e))
fw3_free_rule(rule);
- continue;
- }
-
- if (!rule->_src && !rule->_dest && !rule->src.any && !rule->dest.any)
- {
- warn_elem(e, "has neither a source nor a destination zone assigned "
- "- assuming an output rule");
- }
-
- if (list_empty(&rule->proto))
- {
- warn_elem(e, "does not specify a protocol, assuming TCP+UDP");
- fw3_parse_protocol(&rule->proto, "tcpudp", true);
- }
-
- if (rule->target == FW3_FLAG_UNSPEC)
- {
- warn_elem(e, "has no target specified, defaulting to REJECT");
- rule->target = FW3_FLAG_REJECT;
- }
- else if (rule->target > FW3_FLAG_MARK)
- {
- warn_elem(e, "has invalid target specified, defaulting to REJECT");
- rule->target = FW3_FLAG_REJECT;
- }
-
- /* NB: rule family... */
- if (rule->_dest)
- {
- setbit(rule->_dest->flags[0], rule->target);
- setbit(rule->_dest->flags[1], rule->target);
- }
- else if (need_src_action_chain(rule))
- {
- setbit(rule->_src->flags[0], fw3_to_src_target(rule->target));
- setbit(rule->_src->flags[1], fw3_to_src_target(rule->target));
- }
}
}
{
char chain[32];
- snprintf(chain, sizeof(chain), "delegate_output");
+ snprintf(chain, sizeof(chain), "OUTPUT");
if (rule->target == FW3_FLAG_NOTRACK)
{
snprintf(chain, sizeof(chain), "zone_%s_notrack", rule->src.name);
}
- else if (rule->target == FW3_FLAG_MARK)
+ else if (rule->target == FW3_FLAG_HELPER)
+ {
+ snprintf(chain, sizeof(chain), "zone_%s_helper", rule->src.name);
+ }
+ else if (rule->target == FW3_FLAG_MARK && (rule->_src || rule->src.any))
{
- snprintf(chain, sizeof(chain), "fwmark");
+ snprintf(chain, sizeof(chain), "PREROUTING");
}
else
{
else
{
if (rule->dest.set)
- snprintf(chain, sizeof(chain), "delegate_forward");
+ snprintf(chain, sizeof(chain), "FORWARD");
else
- snprintf(chain, sizeof(chain), "delegate_input");
+ snprintf(chain, sizeof(chain), "INPUT");
}
}
if (rule->dest.set && !rule->src.set)
{
if (rule->dest.any)
- snprintf(chain, sizeof(chain), "delegate_output");
+ snprintf(chain, sizeof(chain), "OUTPUT");
else
snprintf(chain, sizeof(chain), "zone_%s_output",
rule->dest.name);
fw3_ipt_rule_addarg(r, false, "--notrack", NULL);
return;
+ case FW3_FLAG_HELPER:
+ fw3_ipt_rule_target(r, "CT");
+ fw3_ipt_rule_addarg(r, false, "--helper", rule->set_helper.ptr->name);
+ return;
+
case FW3_FLAG_ACCEPT:
case FW3_FLAG_DROP:
name = fw3_flag_names[rule->target];
return;
}
+ if (!fw3_is_family(sip, handle->family) ||
+ !fw3_is_family(dip, handle->family))
+ {
+ if ((sip && !sip->resolved) || (dip && !dip->resolved))
+ info(" ! Skipping due to different family of ip address");
+
+ return;
+ }
+
+ if (!fw3_is_family(sip, handle->family) ||
+ !fw3_is_family(dip, handle->family))
+ {
+ if ((sip && !sip->resolved) || (dip && !dip->resolved))
+ info(" ! Skipping due to different family of ip address");
+
+ return;
+ }
+
if (proto->protocol == 58 && handle->family == FW3_FAMILY_V4)
{
- info(" ! Skipping due to different family of protocol");
+ info(" ! Skipping protocol %s due to different family",
+ fw3_protoname(proto));
+ return;
+ }
+
+ if (rule->helper.ptr &&
+ !fw3_cthelper_check_proto(rule->helper.ptr, proto))
+ {
+ info(" ! Skipping protocol %s since helper '%s' does not support it",
+ fw3_protoname(proto), rule->helper.ptr->name);
+ return;
+ }
+
+ if (rule->set_helper.ptr &&
+ !fw3_cthelper_check_proto(rule->set_helper.ptr, proto))
+ {
+ info(" ! Skipping protocol %s since helper '%s' does not support it",
+ fw3_protoname(proto), rule->helper.ptr->name);
return;
}
fw3_ipt_rule_icmptype(r, icmptype);
fw3_ipt_rule_mac(r, mac);
fw3_ipt_rule_ipset(r, &rule->ipset);
+ fw3_ipt_rule_helper(r, &rule->helper);
fw3_ipt_rule_limit(r, &rule->limit);
fw3_ipt_rule_time(r, &rule->time);
fw3_ipt_rule_mark(r, &rule->mark);
return;
if ((rule->target == FW3_FLAG_NOTRACK && handle->table != FW3_TABLE_RAW) ||
+ (rule->target == FW3_FLAG_HELPER && handle->table != FW3_TABLE_RAW) ||
(rule->target == FW3_FLAG_MARK && handle->table != FW3_TABLE_MANGLE) ||
(rule->target < FW3_FLAG_NOTRACK && handle->table != FW3_TABLE_FILTER))
return;
set(rule->ipset.ptr->flags, handle->family, handle->family);
}
+ if (rule->helper.ptr && !fw3_is_family(rule->helper.ptr, handle->family))
+ {
+ info(" ! Skipping due to unsupported family of CT helper");
+ return;
+ }
+
+ if (rule->set_helper.ptr && !fw3_is_family(rule->set_helper.ptr, handle->family))
+ {
+ info(" ! Skipping due to unsupported family of CT helper");
+ return;
+ }
+
list_for_each_entry(proto, &rule->proto, list)
{
/* icmp / ipv6-icmp */
projects / project / firewall3.git / blobdiff