helpers: fix the set_helper in the rule structure

[project/firewall3.git] / rules.c

diff --git a/rules.c b/rules.c
index 5fb9998..5e1d5f3 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *

- *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
+ *   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
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -32,6 +32,8 @@ const struct fw3_option fw3_rule_opts[] = {
        FW3_OPT("direction",           direction, rule,     direction_out),
 
        FW3_OPT("ipset",               setmatch,  rule,     ipset),
        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),
 
 
        FW3_LIST("proto",              protocol,  rule,     proto),
 


@@ -96,15 +98,6 @@ alloc_rule(struct fw3_state *state)
        return rule;
 }
 
        return rule;
 }
 

-#define warn_rule(r, e, fmt, ...)                                                                      \
-       do {                                                                                                                    \
-               if (e)                                                                                                          \
-                       warn_elem(e, fmt, ##__VA_ARGS__);                                               \
-               else                                                                                                            \
-                       warn("Warning: ubus rule (%s) " fmt,                                    \
-                            (r && r->name) ? r->name : "?", ##__VA_ARGS__);    \
-       } while(0)
-

 static bool
 check_rule(struct fw3_state *state, struct fw3_rule *r, struct uci_element *e)
 {
 static bool
 check_rule(struct fw3_state *state, struct fw3_rule *r, struct uci_element *e)
 {


@@ -113,79 +106,105 @@ check_rule(struct fw3_state *state, struct fw3_rule *r, struct uci_element *e)
 
        if (r->src.invert || r->dest.invert)
        {
 
        if (r->src.invert || r->dest.invert)
        {

-               warn_rule(r, e, "must not have inverted 'src' or 'dest' options");
+               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)))
        {
                return false;
        }
        else if (r->src.set && !r->src.any &&
                 !(r->_src = fw3_lookup_zone(state, r->src.name)))
        {

-               warn_rule(r, e, "refers to not existing zone '%s'", 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)))
        {
                return false;
        }
        else if (r->dest.set && !r->dest.any &&
                 !(r->_dest = fw3_lookup_zone(state, r->dest.name)))
        {

-               warn_rule(r, e, "refers to not existing zone '%s'", 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)
        {
                return false;
        }
        else if (r->ipset.set && state->disable_ipsets)
        {

-               warn_rule(r, e, "skipped due to disabled ipset support");
+               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)))
        {
                return false;
        }
        else if (r->ipset.set &&
                 !(r->ipset.ptr = fw3_lookup_ipset(state, r->ipset.name)))
        {

-               warn_rule(r, e, "refers to unknown ipset '%s'", 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;
        }
 
                return false;
        }
 

-       if (!r->_src && r->target == FW3_FLAG_NOTRACK)
+       if (!r->_src && (r->target == FW3_FLAG_NOTRACK || r->target == FW3_FLAG_HELPER))

        {
        {

-               warn_rule(r, e, "is set to target NOTRACK but has no source assigned");
+               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)
        {
                return false;
        }
 
        if (!r->set_mark.set && !r->set_xmark.set &&
            r->target == FW3_FLAG_MARK)
        {

-               warn_rule(r, e, "is set to target MARK but specifies neither "
+               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)
        {
                                "'set_mark' nor 'set_xmark' option");
                return false;
        }
 
        if (r->_dest && r->target == FW3_FLAG_MARK)
        {

-               warn_rule(r, e, "must not specify 'dest' for MARK target");
+               warn_section("rule", r, e, "must not specify 'dest' for MARK target");

                return false;
        }
 
        if (r->set_mark.invert || r->set_xmark.invert)
        {
                return false;
        }
 
        if (r->set_mark.invert || r->set_xmark.invert)
        {

-               warn_rule(r, e, "must not have inverted 'set_mark' or 'set_xmark'");
+               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)
        {
                return false;
        }
 
        if (!r->_src && !r->_dest && !r->src.any && !r->dest.any)
        {

-               warn_rule(r, e, "has neither a source nor a destination zone assigned "
+               warn_section("rule", r, e, "has neither a source nor a destination zone assigned "

                                "- assuming an output r");
        }
 
        if (list_empty(&r->proto))
        {
                                "- assuming an output r");
        }
 
        if (list_empty(&r->proto))
        {

-               warn_rule(r, e, "does not specify a protocol, assuming TCP+UDP");
+               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)
        {
                fw3_parse_protocol(&r->proto, "tcpudp", true);
        }
 
        if (r->target == FW3_FLAG_UNSPEC)
        {

-               warn_rule(r, e, "has no target specified, defaulting to REJECT");
+               warn_section("rule", r, e, "has no target specified, defaulting to REJECT");

                r->target = FW3_FLAG_REJECT;
        }
        else if (r->target > FW3_FLAG_MARK)
        {
                r->target = FW3_FLAG_REJECT;
        }
        else if (r->target > FW3_FLAG_MARK)
        {

-               warn_rule(r, e, "has invalid target specified, defaulting to REJECT");
+               warn_section("rule", r, e, "has invalid target specified, defaulting to REJECT");

                r->target = FW3_FLAG_REJECT;
        }
 
                r->target = FW3_FLAG_REJECT;
        }
 


@@ -211,21 +230,19 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p,
        struct uci_section *s;
        struct uci_element *e;
        struct fw3_rule *rule;
        struct uci_section *s;
        struct uci_element *e;
        struct fw3_rule *rule;

-       struct blob_attr *entry, *opt;
-       unsigned rem, orem;
+       struct blob_attr *entry;
+       unsigned rem;

 
        INIT_LIST_HEAD(&state->rules);
 
        blob_for_each_attr(entry, a, rem) {
 
        INIT_LIST_HEAD(&state->rules);
 
        blob_for_each_attr(entry, a, rem) {

-               const char *type = NULL;
+               const char *type;

                const char *name = "ubus rule";
                const char *name = "ubus rule";

-               blobmsg_for_each_attr(opt, entry, orem)
-                       if (!strcmp(blobmsg_name(opt), "type"))
-                               type = blobmsg_get_string(opt);
-                       else if (!strcmp(blobmsg_name(opt), "name"))
-                               name = blobmsg_get_string(opt);

 
 

-               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 (!(rule = alloc_rule(state)))


@@ -233,7 +250,7 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p,
 
                if (!fw3_parse_blob_options(rule, fw3_rule_opts, entry, name))
                {
 
                if (!fw3_parse_blob_options(rule, fw3_rule_opts, entry, name))
                {

-                       warn_rule(rule, NULL, "skipped due to invalid options\n");
+                       warn_section("rule", rule, NULL, "skipped due to invalid options");

                        fw3_free_rule(rule);
                        continue;
                }
                        fw3_free_rule(rule);
                        continue;
                }


@@ -276,6 +293,10 @@ append_chain(struct fw3_ipt_rule *r, struct fw3_rule *rule)
        {
                snprintf(chain, sizeof(chain), "zone_%s_notrack", rule->src.name);
        }
        {
                snprintf(chain, sizeof(chain), "zone_%s_notrack", rule->src.name);
        }

+       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), "PREROUTING");
        else if (rule->target == FW3_FLAG_MARK && (rule->_src || rule->src.any))
        {
                snprintf(chain, sizeof(chain), "PREROUTING");


@@ -337,6 +358,11 @@ static void set_target(struct fw3_ipt_rule *r, struct fw3_rule *rule)
                fw3_ipt_rule_addarg(r, false, "--notrack", NULL);
                return;
 
                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];
        case FW3_FLAG_ACCEPT:
        case FW3_FLAG_DROP:
                name = fw3_flag_names[rule->target];


@@ -384,9 +410,44 @@ print_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                return;
        }
 
                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)
        {
        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;
        }
 
                return;
        }
 


@@ -396,6 +457,7 @@ print_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
        fw3_ipt_rule_icmptype(r, icmptype);
        fw3_ipt_rule_mac(r, mac);
        fw3_ipt_rule_ipset(r, &rule->ipset);
        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);
        fw3_ipt_rule_limit(r, &rule->limit);
        fw3_ipt_rule_time(r, &rule->time);
        fw3_ipt_rule_mark(r, &rule->mark);


@@ -428,6 +490,7 @@ expand_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                return;
 
        if ((rule->target == FW3_FLAG_NOTRACK && handle->table != FW3_TABLE_RAW) ||
                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;
            (rule->target == FW3_FLAG_MARK && handle->table != FW3_TABLE_MANGLE) ||
                (rule->target < FW3_FLAG_NOTRACK && handle->table != FW3_TABLE_FILTER))
                return;


@@ -463,6 +526,18 @@ expand_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                set(rule->ipset.ptr->flags, handle->family, handle->family);
        }
 
                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 */
        list_for_each_entry(proto, &rule->proto, list)
        {
                /* icmp / ipv6-icmp */