X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=505ab208b24b2fb7a0c25a54efe942b0f9c86433;hp=8b4bbcd09879b7cf76db5b5f3ac9c1a9f74a6f1f;hb=HEAD;hpb=13698aafb52c45817ee7815da3405e620657c8d0 diff --git a/zones.c b/zones.c index 8b4bbcd..505ab20 100644 --- a/zones.c +++ b/zones.c @@ -18,6 +18,7 @@ #include "zones.h" #include "ubus.h" +#include "helpers.h" #define C(f, tbl, tgt, fmt) \ @@ -39,6 +40,7 @@ static const struct fw3_chain_spec zone_chains[] = { C(V4, NAT, SNAT, "zone_%s_postrouting"), C(V4, NAT, DNAT, "zone_%s_prerouting"), + C(ANY, RAW, HELPER, "zone_%s_helper"), C(ANY, RAW, NOTRACK, "zone_%s_notrack"), C(ANY, FILTER, CUSTOM_CHAINS, "input_%s_rule"), @@ -51,6 +53,11 @@ static const struct fw3_chain_spec zone_chains[] = { { } }; +enum fw3_zone_logmask { + FW3_ZONE_LOG_FILTER = (1 << 0), + FW3_ZONE_LOG_MANGLE = (1 << 1), +}; + const struct fw3_option fw3_zone_opts[] = { FW3_OPT("enabled", bool, zone, enabled), @@ -66,6 +73,7 @@ const struct fw3_option fw3_zone_opts[] = { FW3_OPT("output", target, zone, policy_output), FW3_OPT("masq", bool, zone, masq), + FW3_OPT("masq_allow_invalid", bool, zone, masq_allow_invalid), FW3_LIST("masq_src", network, zone, masq_src), FW3_LIST("masq_dest", network, zone, masq_dest), @@ -76,9 +84,12 @@ const struct fw3_option fw3_zone_opts[] = { FW3_OPT("mtu_fix", bool, zone, mtu_fix), FW3_OPT("custom_chains", bool, zone, custom_chains), - FW3_OPT("log", bool, zone, log), + FW3_OPT("log", int, zone, log), FW3_OPT("log_limit", limit, zone, log_limit), + FW3_OPT("auto_helper", bool, zone, auto_helper), + FW3_LIST("helper", cthelper, zone, cthelpers), + FW3_OPT("__flags_v4", int, zone, flags[0]), FW3_OPT("__flags_v6", int, zone, flags[1]), @@ -104,6 +115,26 @@ check_policy(struct uci_element *e, enum fw3_flag *pol, enum fw3_flag def, } } +static bool +check_masq_addrs(struct list_head *head) +{ + struct fw3_address *addr; + int n_addr = 0, n_failed = 0; + + list_for_each_entry(addr, head, list) + { + if (addr->invert) + continue; + + n_addr++; + + if (!addr->set && addr->resolved) + n_failed++; + } + + return (n_addr == 0 || n_failed < n_addr); +} + static void resolve_networks(struct uci_element *e, struct fw3_zone *zone) { @@ -124,6 +155,46 @@ resolve_networks(struct uci_element *e, struct fw3_zone *zone) } } +static void +resolve_cthelpers(struct fw3_state *s, struct uci_element *e, struct fw3_zone *zone) +{ + struct fw3_cthelpermatch *match; + + if (list_empty(&zone->cthelpers)) + { + if (!zone->masq && zone->auto_helper) + { + fw3_setbit(zone->flags[0], FW3_FLAG_HELPER); + fw3_setbit(zone->flags[1], FW3_FLAG_HELPER); + } + + return; + } + + list_for_each_entry(match, &zone->cthelpers, list) + { + if (match->invert) + { + warn_elem(e, "must not use a negated helper match"); + continue; + } + + match->ptr = fw3_lookup_cthelper(s, match->name); + + if (!match->ptr) + { + warn_elem(e, "refers to not existing helper '%s'", match->name); + continue; + } + + if (fw3_is_family(match->ptr, FW3_FAMILY_V4)) + fw3_setbit(zone->flags[0], FW3_FLAG_HELPER); + + if (fw3_is_family(match->ptr, FW3_FAMILY_V6)) + fw3_setbit(zone->flags[1], FW3_FLAG_HELPER); + } +} + struct fw3_zone * fw3_alloc_zone(void) { @@ -138,10 +209,12 @@ fw3_alloc_zone(void) INIT_LIST_HEAD(&zone->subnets); INIT_LIST_HEAD(&zone->masq_src); INIT_LIST_HEAD(&zone->masq_dest); + INIT_LIST_HEAD(&zone->cthelpers); INIT_LIST_HEAD(&zone->old_addrs); zone->enabled = true; + zone->auto_helper = true; zone->custom_chains = true; zone->log_limit.rate = 10; @@ -170,7 +243,8 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) if (!zone) continue; - fw3_parse_options(zone, fw3_zone_opts, s); + if (!fw3_parse_options(zone, fw3_zone_opts, s)) + warn_elem(e, "has invalid options"); if (!zone->enabled) { @@ -184,6 +258,9 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) if (!defs->custom_chains && zone->custom_chains) zone->custom_chains = false; + if (!defs->auto_helper && zone->auto_helper) + zone->auto_helper = false; + if (!zone->name || !*zone->name) { warn_elem(e, "has no name - ignoring"); @@ -207,6 +284,18 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) warn_elem(e, "has no device, network, subnet or extra options"); } + if (!check_masq_addrs(&zone->masq_src)) + { + warn_elem(e, "has unresolved masq_src, disabling masq"); + zone->masq = false; + } + + if (!check_masq_addrs(&zone->masq_dest)) + { + warn_elem(e, "has unresolved masq_dest, disabling masq"); + zone->masq = false; + } + check_policy(e, &zone->policy_input, defs->policy_input, "input"); check_policy(e, &zone->policy_output, defs->policy_output, "output"); check_policy(e, &zone->policy_forward, defs->policy_forward, "forward"); @@ -224,6 +313,8 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) fw3_setbit(zone->flags[0], FW3_FLAG_DNAT); } + resolve_cthelpers(state, e, zone); + 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); @@ -259,8 +350,6 @@ print_zone_chain(struct fw3_ipt_handle *handle, struct fw3_state *state, if (!fw3_is_family(zone, handle->family)) return; - info(" * Zone '%s'", zone->name); - set(zone->flags, handle->family, handle->table); if (zone->custom_chains) @@ -292,7 +381,7 @@ print_zone_chain(struct fw3_ipt_handle *handle, struct fw3_state *state, for (i = 0; i < sizeof(flt_chains)/sizeof(flt_chains[0]); i += 2) { r = fw3_ipt_rule_new(handle); - fw3_ipt_rule_comment(r, "user chain for %s", flt_chains[i+1]); + fw3_ipt_rule_comment(r, "Custom %s %s rule chain", zone->name, flt_chains[i+1]); fw3_ipt_rule_target(r, "%s_%s_rule", flt_chains[i+1], zone->name); fw3_ipt_rule_append(r, "zone_%s_%s", zone->name, flt_chains[i]); } @@ -302,7 +391,7 @@ print_zone_chain(struct fw3_ipt_handle *handle, struct fw3_state *state, for (i = 0; i < sizeof(nat_chains)/sizeof(nat_chains[0]); i += 2) { r = fw3_ipt_rule_new(handle); - fw3_ipt_rule_comment(r, "user chain for %s", nat_chains[i+1]); + fw3_ipt_rule_comment(r, "Custom %s %s rule chain", zone->name, nat_chains[i+1]); fw3_ipt_rule_target(r, "%s_%s_rule", nat_chains[i+1], zone->name); fw3_ipt_rule_append(r, "zone_%s_%s", zone->name, nat_chains[i]); } @@ -338,6 +427,37 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, { for (t = FW3_FLAG_ACCEPT; t <= FW3_FLAG_DROP; t++) { + if (t > FW3_FLAG_ACCEPT && zone->log & FW3_ZONE_LOG_FILTER) + { + if (has(zone->flags, handle->family, fw3_to_src_target(t))) + { + r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + + snprintf(buf, sizeof(buf) - 1, "%s %s in: ", + fw3_flag_names[t], zone->name); + + fw3_ipt_rule_limit(r, &zone->log_limit); + fw3_ipt_rule_target(r, "LOG"); + fw3_ipt_rule_addarg(r, false, "--log-prefix", buf); + fw3_ipt_rule_replace(r, "zone_%s_src_%s", + zone->name, fw3_flag_names[t]); + } + + if (has(zone->flags, handle->family, t)) + { + r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub); + + snprintf(buf, sizeof(buf) - 1, "%s %s out: ", + fw3_flag_names[t], zone->name); + + fw3_ipt_rule_limit(r, &zone->log_limit); + fw3_ipt_rule_target(r, "LOG"); + fw3_ipt_rule_addarg(r, false, "--log-prefix", buf); + fw3_ipt_rule_replace(r, "zone_%s_dest_%s", + zone->name, fw3_flag_names[t]); + } + } + if (has(zone->flags, handle->family, fw3_to_src_target(t))) { r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); @@ -354,14 +474,20 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, if (has(zone->flags, handle->family, t)) { + if (t == FW3_FLAG_ACCEPT && + zone->masq && !zone->masq_allow_invalid) + { + r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub); + fw3_ipt_rule_extra(r, "-m conntrack --ctstate INVALID"); + fw3_ipt_rule_comment(r, "Prevent NAT leakage"); + fw3_ipt_rule_target(r, fw3_flag_names[FW3_FLAG_DROP]); + fw3_ipt_rule_replace(r, "zone_%s_dest_%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]); } @@ -406,15 +532,15 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, { if (zone->mtu_fix) { - if (zone->log) + if (zone->log & FW3_ZONE_LOG_MANGLE) { - snprintf(buf, sizeof(buf) - 1, "MSSFIX(%s): ", zone->name); + snprintf(buf, sizeof(buf) - 1, "MSSFIX %s out: ", zone->name); r = fw3_ipt_rule_create(handle, &tcp, NULL, dev, NULL, sub); fw3_ipt_rule_addarg(r, false, "--tcp-flags", "SYN,RST"); fw3_ipt_rule_addarg(r, false, "SYN", NULL); fw3_ipt_rule_limit(r, &zone->log_limit); - fw3_ipt_rule_comment(r, "%s (mtu_fix logging)", zone->name); + fw3_ipt_rule_comment(r, "Zone %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, "FORWARD"); @@ -423,7 +549,7 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, r = fw3_ipt_rule_create(handle, &tcp, NULL, dev, NULL, sub); fw3_ipt_rule_addarg(r, false, "--tcp-flags", "SYN,RST"); fw3_ipt_rule_addarg(r, false, "SYN", NULL); - fw3_ipt_rule_comment(r, "%s (mtu_fix)", zone->name); + fw3_ipt_rule_comment(r, "Zone %s MTU fixing", zone->name); fw3_ipt_rule_target(r, "TCPMSS"); fw3_ipt_rule_addarg(r, false, "--clamp-mss-to-pmtu", NULL); fw3_ipt_rule_replace(r, "FORWARD"); @@ -431,9 +557,19 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, } else if (handle->table == FW3_TABLE_RAW) { + if (has(zone->flags, handle->family, FW3_FLAG_HELPER)) + { + r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + fw3_ipt_rule_comment(r, "%s CT helper assignment", zone->name); + fw3_ipt_rule_target(r, "zone_%s_helper", zone->name); + fw3_ipt_rule_extra(r, zone->extra_src); + fw3_ipt_rule_replace(r, "PREROUTING"); + } + if (has(zone->flags, handle->family, FW3_FLAG_NOTRACK)) { r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + fw3_ipt_rule_comment(r, "%s CT bypass", zone->name); fw3_ipt_rule_target(r, "zone_%s_notrack", zone->name); fw3_ipt_rule_extra(r, zone->extra_src); fw3_ipt_rule_replace(r, "PREROUTING"); @@ -472,7 +608,7 @@ next_addr(struct fw3_address *addr, struct list_head *list, { rv = list_entry(p, struct fw3_address, list); - if (fw3_is_family(rv, family) && rv->invert == invert) + if (fw3_is_family(rv, family) && rv->set && rv->invert == invert) return rv; } @@ -488,12 +624,11 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, struct fw3_address *mdest; struct fw3_ipt_rule *r; - enum fw3_flag t; - char buf[32]; - if (!fw3_is_family(zone, handle->family)) return; + info(" * Zone '%s'", zone->name); + switch (handle->table) { case FW3_TABLE_FILTER: @@ -527,39 +662,6 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, fw3_flag_names[zone->policy_output]); fw3_ipt_rule_append(r, "zone_%s_output", zone->name); - if (zone->log) - { - for (t = FW3_FLAG_REJECT; t <= FW3_FLAG_DROP; t++) - { - if (has(zone->flags, handle->family, fw3_to_src_target(t))) - { - r = fw3_ipt_rule_new(handle); - - snprintf(buf, sizeof(buf) - 1, "%s(src %s)", - fw3_flag_names[t], zone->name); - - fw3_ipt_rule_limit(r, &zone->log_limit); - fw3_ipt_rule_target(r, "LOG"); - fw3_ipt_rule_addarg(r, false, "--log-prefix", buf); - fw3_ipt_rule_append(r, "zone_%s_src_%s", - zone->name, fw3_flag_names[t]); - } - - if (has(zone->flags, handle->family, t)) - { - r = fw3_ipt_rule_new(handle); - - snprintf(buf, sizeof(buf) - 1, "%s(dest %s)", - fw3_flag_names[t], zone->name); - - fw3_ipt_rule_limit(r, &zone->log_limit); - fw3_ipt_rule_target(r, "LOG"); - fw3_ipt_rule_addarg(r, false, "--log-prefix", buf); - fw3_ipt_rule_append(r, "zone_%s_dest_%s", - zone->name, fw3_flag_names[t]); - } - } - } break; case FW3_TABLE_NAT: @@ -614,6 +716,9 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, break; case FW3_TABLE_RAW: + fw3_print_cthelpers(handle, state, zone); + break; + case FW3_TABLE_MANGLE: break; }