X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=zones.c;h=51a8fdf6af58bb51a7ab39d7f04c50145cb9a725;hb=HEAD;hp=7638443c5b320b65125fdb6e9b1688bc4f6f06eb;hpb=f50a524847a0ac74ef8cc74011d3cc46e9269c6b;p=project%2Ffirewall3.git diff --git a/zones.c b/zones.c index 7638443..51a8fdf 100644 --- a/zones.c +++ b/zones.c @@ -25,34 +25,39 @@ { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_FLAG_##tgt, fmt } 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"), + C(ANY, FILTER, UNSPEC, "zone_?_input"), + C(ANY, FILTER, UNSPEC, "zone_?_output"), + C(ANY, FILTER, UNSPEC, "zone_?_forward"), - C(ANY, FILTER, SRC_ACCEPT, "zone_%s_src_ACCEPT"), - C(ANY, FILTER, SRC_REJECT, "zone_%s_src_REJECT"), - C(ANY, FILTER, SRC_DROP, "zone_%s_src_DROP"), + C(ANY, FILTER, SRC_ACCEPT, "zone_?_src_ACCEPT"), + C(ANY, FILTER, SRC_REJECT, "zone_?_src_REJECT"), + C(ANY, FILTER, SRC_DROP, "zone_?_src_DROP"), - C(ANY, FILTER, ACCEPT, "zone_%s_dest_ACCEPT"), - C(ANY, FILTER, REJECT, "zone_%s_dest_REJECT"), - C(ANY, FILTER, DROP, "zone_%s_dest_DROP"), + C(ANY, FILTER, ACCEPT, "zone_?_dest_ACCEPT"), + C(ANY, FILTER, REJECT, "zone_?_dest_REJECT"), + C(ANY, FILTER, DROP, "zone_?_dest_DROP"), - C(V4, NAT, SNAT, "zone_%s_postrouting"), - C(V4, NAT, DNAT, "zone_%s_prerouting"), + C(V4, NAT, SNAT, "zone_?_postrouting"), + C(V4, NAT, DNAT, "zone_?_prerouting"), - C(ANY, RAW, HELPER, "zone_%s_helper"), - C(ANY, RAW, NOTRACK, "zone_%s_notrack"), + C(ANY, RAW, HELPER, "zone_?_helper"), + C(ANY, RAW, NOTRACK, "zone_?_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"), + C(ANY, FILTER, CUSTOM_CHAINS, "input_?_rule"), + C(ANY, FILTER, CUSTOM_CHAINS, "output_?_rule"), + C(ANY, FILTER, CUSTOM_CHAINS, "forwarding_?_rule"), - C(V4, NAT, CUSTOM_CHAINS, "prerouting_%s_rule"), - C(V4, NAT, CUSTOM_CHAINS, "postrouting_%s_rule"), + C(V4, NAT, CUSTOM_CHAINS, "prerouting_?_rule"), + C(V4, NAT, CUSTOM_CHAINS, "postrouting_?_rule"), { } }; +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), @@ -79,7 +84,7 @@ 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), @@ -93,7 +98,6 @@ const struct fw3_option fw3_zone_opts[] = { { } }; - static void check_policy(struct uci_element *e, enum fw3_flag *pol, enum fw3_flag def, const char *name) @@ -133,7 +137,7 @@ check_masq_addrs(struct list_head *head) static void resolve_networks(struct uci_element *e, struct fw3_zone *zone) { - struct fw3_device *net, *tmp; + struct fw3_device *net, *dev, *tmp; list_for_each_entry(net, &zone->networks, list) { @@ -145,8 +149,15 @@ resolve_networks(struct uci_element *e, struct fw3_zone *zone) continue; } + list_for_each_entry(dev, &zone->devices, list) + if (!strcmp(dev->name, tmp->name)) + goto alias; + snprintf(tmp->network, sizeof(tmp->network), "%s", net->name); list_add_tail(&tmp->list, &zone->devices); + continue; +alias: + free(tmp); } } @@ -323,6 +334,38 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) } +static char * +format_chain(const char *fmt, const char *zonename) +{ + static char chain[32]; + size_t rem; + char *p; + int len; + + for (p = chain, rem = sizeof(chain); *fmt; fmt++) { + if (*fmt == '?') { + len = snprintf(p, rem, "%s", zonename); + + if (len < 0 || len >= rem) + break; + + rem -= len; + p += len; + } + else { + if (rem <= 1) + break; + + *p++ = *fmt; + rem--; + } + } + + *p = 0; + + return chain; +} + static void print_zone_chain(struct fw3_ipt_handle *handle, struct fw3_state *state, bool reload, struct fw3_zone *zone) @@ -352,10 +395,6 @@ print_zone_chain(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 && c->flag == FW3_FLAG_CUSTOM_CHAINS) - continue; - if (!fw3_is_family(c, handle->family)) continue; @@ -366,7 +405,7 @@ print_zone_chain(struct fw3_ipt_handle *handle, struct fw3_state *state, !fw3_hasbit(zone->flags[handle->family == FW3_FAMILY_V6], c->flag)) continue; - fw3_ipt_create_chain(handle, c->format, zone->name); + fw3_ipt_create_chain(handle, reload, format_chain(c->format, zone->name)); } if (zone->custom_chains) @@ -376,7 +415,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]); } @@ -386,7 +425,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]); } @@ -422,6 +461,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); @@ -496,15 +566,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"); @@ -513,7 +583,15 @@ 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"); + + r = fw3_ipt_rule_create(handle, &tcp, dev, NULL, sub, NULL); + fw3_ipt_rule_addarg(r, false, "--tcp-flags", "SYN,RST"); + fw3_ipt_rule_addarg(r, false, "SYN", NULL); + 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"); @@ -521,22 +599,27 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, } else if (handle->table == FW3_TABLE_RAW) { + bool loopback_dev = (dev != NULL && !dev->any && + !dev->invert && fw3_check_loopback_dev(dev->name)); + char *chain = loopback_dev || (sub != NULL && !sub->invert && fw3_check_loopback_addr(sub)) ? + "OUTPUT" : "PREROUTING"; + if (has(zone->flags, handle->family, FW3_FLAG_HELPER)) { - r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + r = fw3_ipt_rule_create(handle, NULL, loopback_dev ? 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"); + fw3_ipt_rule_replace(r, chain); } if (has(zone->flags, handle->family, FW3_FLAG_NOTRACK)) { - r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + r = fw3_ipt_rule_create(handle, NULL, loopback_dev ? 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"); + fw3_ipt_rule_replace(r, chain); } } } @@ -554,7 +637,7 @@ print_interface_rules(struct fw3_ipt_handle *handle, struct fw3_state *state, if (!fw3_is_family(sub, handle->family)) continue; - if (!dev && !sub) + if (!dev && !sub && !zone->extra_src && !zone->extra_dest) continue; print_interface_rule(handle, state, reload, zone, dev, sub); @@ -588,9 +671,6 @@ 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; @@ -629,39 +709,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: @@ -752,13 +799,13 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state, { struct fw3_zone *z, *tmp; const struct fw3_chain_spec *c; - char chain[32]; list_for_each_entry_safe(z, tmp, &state->zones, list) { if (!has(z->flags, handle->family, handle->table)) continue; + /* first flush all rules ... */ for (c = zone_chains; c->format; c++) { /* don't touch user chains on selective stop */ @@ -774,15 +821,23 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state, if (c->flag && !has(z->flags, handle->family, c->flag)) continue; - snprintf(chain, sizeof(chain), c->format, z->name); - fw3_ipt_flush_chain(handle, chain); + fw3_ipt_flush_chain(handle, format_chain(c->format, z->name)); + } - /* keep certain basic chains that do not depend on any settings to - avoid purging unrelated user rules pointing to them */ - if (reload && !c->flag) + /* ... then remove the chains */ + for (c = zone_chains; c->format; c++) + { + if (!fw3_is_family(c, handle->family)) + continue; + + if (c->table != handle->table) + continue; + + if (c->flag && !has(z->flags, handle->family, c->flag)) continue; - fw3_ipt_delete_chain(handle, chain); + fw3_ipt_delete_chain(handle, reload, + format_chain(c->format, z->name)); } del(z->flags, handle->family, handle->table);