X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=86f794816f5d26fd6a3daa25a9844c85b6d81c45;hp=fbde74ef63de70a72c227338bd5157482f9853f9;hb=54c0625e83a5ddf77e1753885c96f488ba38f78a;hpb=6e6afb0c7d4d69e4a48122664645c8de67f34c96 diff --git a/zones.c b/zones.c index fbde74e..86f7948 100644 --- a/zones.c +++ b/zones.c @@ -31,28 +31,56 @@ struct chain { }; static const struct chain src_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_%1$s_input"), + C(ANY, FILTER, UNSPEC, "zone_%1$s_output"), + C(ANY, FILTER, UNSPEC, "zone_%1$s_forward"), - C(ANY, FILTER, ACCEPT, "zone_%s_src_ACCEPT"), - C(ANY, FILTER, REJECT, "zone_%s_src_REJECT"), - C(ANY, FILTER, DROP, "zone_%s_src_DROP"), + C(ANY, FILTER, ACCEPT, "zone_%1$s_src_ACCEPT"), + C(ANY, FILTER, REJECT, "zone_%1$s_src_REJECT"), + C(ANY, FILTER, DROP, "zone_%1$s_src_DROP"), }; static const struct chain dst_chains[] = { - 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_%1$s_dest_ACCEPT"), + C(ANY, FILTER, REJECT, "zone_%1$s_dest_REJECT"), + C(ANY, FILTER, DROP, "zone_%1$s_dest_DROP"), + + C(V4, NAT, SNAT, "zone_%1$s_postrouting"), + C(V4, NAT, DNAT, "zone_%1$s_prerouting"), + + C(ANY, FILTER, CUSTOM_CNS_V4, "input_%1$s_rule"), + C(ANY, FILTER, CUSTOM_CNS_V4, "output_%1$s_rule"), + C(ANY, FILTER, CUSTOM_CNS_V4, "forwarding_%1$s_rule"), + C(ANY, FILTER, CUSTOM_CNS_V6, "input_%1$s_rule"), + C(ANY, FILTER, CUSTOM_CNS_V6, "output_%1$s_rule"), + C(ANY, FILTER, CUSTOM_CNS_V6, "forwarding_%1$s_rule"), + + C(V4, NAT, CUSTOM_CNS_V4, "prerouting_%1$s_rule"), + C(V4, NAT, CUSTOM_CNS_V4, "postrouting_%1$s_rule"), +}; + - C(V4, NAT, SNAT, "zone_%s_postrouting"), - C(V4, NAT, DNAT, "zone_%s_prerouting"), +#define R(dir1, dir2) \ + "zone_%1$s_" #dir1 " -m comment --comment \"user chain for %1$s " \ + #dir2 "\" -j " #dir2 "_%1$s_rule" - C(ANY, RAW, NOTRACK, "zone_%s_notrack"), +static const struct chain def_rules[] = { + C(ANY, FILTER, CUSTOM_CNS_V4, R(input, input)), + C(ANY, FILTER, CUSTOM_CNS_V4, R(output, output)), + C(ANY, FILTER, CUSTOM_CNS_V4, R(forward, forwarding)), + C(ANY, FILTER, CUSTOM_CNS_V6, R(input, input)), + C(ANY, FILTER, CUSTOM_CNS_V6, R(output, output)), + C(ANY, FILTER, CUSTOM_CNS_V6, R(forward, forwarding)), + + C(V4, NAT, CUSTOM_CNS_V4, R(prerouting, prerouting)), + C(V4, NAT, CUSTOM_CNS_V4, R(postrouting, postrouting)), }; -static struct fw3_option zone_opts[] = { +const struct fw3_option fw3_zone_opts[] = { + FW3_OPT("enabled", bool, zone, enabled), + FW3_OPT("name", string, zone, name), + FW3_OPT("family", family, zone, family), FW3_LIST("network", device, zone, networks), FW3_LIST("device", device, zone, devices), @@ -76,16 +104,18 @@ static struct fw3_option zone_opts[] = { FW3_OPT("log", bool, zone, log), FW3_OPT("log_limit", limit, zone, log_limit), + + { } }; static bool print_chains(enum fw3_table table, enum fw3_family family, - const char *fmt, const char *name, uint16_t targets, + const char *fmt, const char *name, uint32_t targets, const struct chain *chains, int n) { bool rv = false; - char cn[128] = { 0 }; + char cn[256] = { 0 }; const struct chain *c; for (c = chains; n > 0; c++, n--) @@ -143,6 +173,31 @@ resolve_networks(struct uci_element *e, struct fw3_zone *zone) } } +struct fw3_zone * +fw3_alloc_zone(void) +{ + struct fw3_zone *zone; + + zone = malloc(sizeof(*zone)); + + if (!zone) + return NULL; + + memset(zone, 0, sizeof(*zone)); + + INIT_LIST_HEAD(&zone->networks); + INIT_LIST_HEAD(&zone->devices); + INIT_LIST_HEAD(&zone->subnets); + INIT_LIST_HEAD(&zone->masq_src); + INIT_LIST_HEAD(&zone->masq_dest); + + zone->enabled = true; + zone->custom_chains = true; + zone->log_limit.rate = 10; + + return zone; +} + void fw3_load_zones(struct fw3_state *state, struct uci_package *p) { @@ -160,26 +215,25 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) if (strcmp(s->type, "zone")) continue; - zone = malloc(sizeof(*zone)); + zone = fw3_alloc_zone(); if (!zone) continue; - memset(zone, 0, sizeof(*zone)); - - INIT_LIST_HEAD(&zone->networks); - INIT_LIST_HEAD(&zone->devices); - INIT_LIST_HEAD(&zone->subnets); - INIT_LIST_HEAD(&zone->masq_src); - INIT_LIST_HEAD(&zone->masq_dest); + fw3_parse_options(zone, fw3_zone_opts, s); - zone->log_limit.rate = 10; - - fw3_parse_options(zone, zone_opts, ARRAY_SIZE(zone_opts), s); + if (!zone->enabled) + { + fw3_free_zone(zone); + continue; + } if (!zone->extra_dest) zone->extra_dest = zone->extra_src; + if (!defs->custom_chains && zone->custom_chains) + zone->custom_chains = false; + if (!zone->name || !*zone->name) { warn_elem(e, "has no name - ignoring"); @@ -205,6 +259,12 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) zone->conntrack = true; } + if (zone->custom_chains) + { + setbit(zone->dst_flags, FW3_TARGET_SNAT); + setbit(zone->dst_flags, FW3_TARGET_DNAT); + } + setbit(zone->src_flags, zone->policy_input); setbit(zone->dst_flags, zone->policy_output); setbit(zone->dst_flags, zone->policy_forward); @@ -216,24 +276,46 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) static void print_zone_chain(enum fw3_table table, enum fw3_family family, - struct fw3_zone *zone, bool disable_notrack) + struct fw3_zone *zone, struct fw3_state *state) { - bool s, d; + bool s, d, r; + enum fw3_target f; + uint32_t custom_mask = ~0; if (!fw3_is_family(zone, family)) return; - if (!zone->conntrack && !disable_notrack) + setbit(zone->dst_flags, family); + + /* user chains already loaded, don't create again */ + for (f = FW3_TARGET_CUSTOM_CNS_V4; f <= FW3_TARGET_CUSTOM_CNS_V6; f++) + if (hasbit(zone->running_dst_flags, f)) + delbit(custom_mask, f); + + if (zone->custom_chains) + setbit(zone->dst_flags, (family == FW3_FAMILY_V4) ? + FW3_TARGET_CUSTOM_CNS_V4 : FW3_TARGET_CUSTOM_CNS_V6); + + if (!zone->conntrack && !state->defaults.drop_invalid) setbit(zone->dst_flags, FW3_TARGET_NOTRACK); s = print_chains(table, family, ":%s - [0:0]\n", zone->name, - zone->src_flags, src_chains, ARRAY_SIZE(src_chains)); + zone->src_flags, + src_chains, ARRAY_SIZE(src_chains)); d = print_chains(table, family, ":%s - [0:0]\n", zone->name, - zone->dst_flags, dst_chains, ARRAY_SIZE(dst_chains)); + zone->dst_flags & custom_mask, + dst_chains, ARRAY_SIZE(dst_chains)); - if (s || d) + r = print_chains(table, family, "-A %s\n", zone->name, + zone->dst_flags, + def_rules, ARRAY_SIZE(def_rules)); + + if (s || d || r) + { info(" * Zone '%s'", zone->name); + fw3_set_running(zone, &state->running_zones); + } } static void @@ -242,12 +324,9 @@ print_interface_rule(enum fw3_table table, enum fw3_family family, struct fw3_address *sub, bool disable_notrack) { enum fw3_target t; - const char *targets[] = { - "(bug)", "(bug)", - "ACCEPT", "ACCEPT", - "REJECT", "reject", - "DROP", "DROP", - }; + +#define jump_target(t) \ + ((t == FW3_TARGET_REJECT) ? "reject" : fw3_flag_names[t]) if (table == FW3_TABLE_FILTER) { @@ -255,20 +334,20 @@ print_interface_rule(enum fw3_table table, enum fw3_family family, { if (hasbit(zone->src_flags, t)) { - fw3_pr("-A zone_%s_src_%s", zone->name, targets[t*2]); + fw3_pr("-A zone_%s_src_%s", zone->name, fw3_flag_names[t]); fw3_format_in_out(dev, NULL); fw3_format_src_dest(sub, NULL); fw3_format_extra(zone->extra_src); - fw3_pr(" -j %s\n", targets[t*2+1]); + fw3_pr(" -j %s\n", jump_target(t)); } if (hasbit(zone->dst_flags, t)) { - fw3_pr("-A zone_%s_dest_%s", zone->name, targets[t*2]); + fw3_pr("-A zone_%s_dest_%s", zone->name, fw3_flag_names[t]); fw3_format_in_out(NULL, dev); fw3_format_src_dest(NULL, sub); fw3_format_extra(zone->extra_dest); - fw3_pr(" -j %s\n", targets[t*2+1]); + fw3_pr(" -j %s\n", jump_target(t)); } } @@ -375,15 +454,6 @@ print_zone_rule(enum fw3_table table, enum fw3_family family, struct fw3_address *mdest; enum fw3_target t; - const char *targets[] = { - "(bug)", - "ACCEPT", - "REJECT", - "DROP", - "(bug)", - "(bug)", - "(bug)", - }; if (!fw3_is_family(zone, family)) return; @@ -392,13 +462,13 @@ print_zone_rule(enum fw3_table table, enum fw3_family family, { case FW3_TABLE_FILTER: fw3_pr("-A zone_%s_input -j zone_%s_src_%s\n", - zone->name, zone->name, targets[zone->policy_input]); + zone->name, zone->name, fw3_flag_names[zone->policy_input]); fw3_pr("-A zone_%s_forward -j zone_%s_dest_%s\n", - zone->name, zone->name, targets[zone->policy_forward]); + zone->name, zone->name, fw3_flag_names[zone->policy_forward]); fw3_pr("-A zone_%s_output -j zone_%s_dest_%s\n", - zone->name, zone->name, targets[zone->policy_output]); + zone->name, zone->name, fw3_flag_names[zone->policy_output]); if (zone->log) { @@ -406,18 +476,18 @@ print_zone_rule(enum fw3_table table, enum fw3_family family, { if (hasbit(zone->src_flags, t)) { - fw3_pr("-A zone_%s_src_%s", zone->name, targets[t]); + fw3_pr("-A zone_%s_src_%s", zone->name, fw3_flag_names[t]); fw3_format_limit(&zone->log_limit); fw3_pr(" -j LOG --log-prefix \"%s(src %s)\"\n", - targets[t], zone->name); + fw3_flag_names[t], zone->name); } if (hasbit(zone->dst_flags, t)) { - fw3_pr("-A zone_%s_dest_%s", zone->name, targets[t]); + fw3_pr("-A zone_%s_dest_%s", zone->name, fw3_flag_names[t]); fw3_format_limit(&zone->log_limit); fw3_pr(" -j LOG --log-prefix \"%s(dest %s)\"\n", - targets[t], zone->name); + fw3_flag_names[t], zone->name); } } } @@ -451,7 +521,7 @@ fw3_print_zone_chains(enum fw3_table table, enum fw3_family family, struct fw3_zone *zone; list_for_each_entry(zone, &state->zones, list) - print_zone_chain(table, family, zone, state->defaults.drop_invalid); + print_zone_chain(table, family, zone, state); } void @@ -466,25 +536,44 @@ fw3_print_zone_rules(enum fw3_table table, enum fw3_family family, void fw3_flush_zones(enum fw3_table table, enum fw3_family family, - bool pass2, struct list_head *statefile) + bool pass2, bool reload, struct fw3_state *state) { - struct fw3_statefile_entry *e; + struct fw3_zone *z, *tmp; + uint32_t custom_mask = ~0; + uint32_t family_mask = (1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6); + + /* don't touch user chains on selective stop */ + if (reload) + { + delbit(custom_mask, FW3_TARGET_CUSTOM_CNS_V4); + delbit(custom_mask, FW3_TARGET_CUSTOM_CNS_V6); + } - list_for_each_entry(e, statefile, list) + list_for_each_entry_safe(z, tmp, &state->running_zones, running_list) { - if (e->type != FW3_TYPE_ZONE) + if (!hasbit(z->dst_flags, family)) continue; print_chains(table, family, pass2 ? "-X %s\n" : "-F %s\n", - e->name, e->flags[0], src_chains, ARRAY_SIZE(src_chains)); + z->name, z->running_src_flags, + src_chains, ARRAY_SIZE(src_chains)); print_chains(table, family, pass2 ? "-X %s\n" : "-F %s\n", - e->name, e->flags[1], dst_chains, ARRAY_SIZE(dst_chains)); + z->name, z->running_dst_flags & custom_mask, + dst_chains, ARRAY_SIZE(dst_chains)); + + if (pass2) + { + delbit(z->dst_flags, family); + + if (!(z->dst_flags & family_mask)) + fw3_set_running(z, NULL); + } } } struct fw3_zone * -fw3_lookup_zone(struct fw3_state *state, const char *name) +fw3_lookup_zone(struct fw3_state *state, const char *name, bool running) { struct fw3_zone *z; @@ -492,21 +581,15 @@ fw3_lookup_zone(struct fw3_state *state, const char *name) return NULL; list_for_each_entry(z, &state->zones, list) - if (!strcmp(z->name, name)) - return z; - - return NULL; -} + { + if (strcmp(z->name, name)) + continue; -void -fw3_free_zone(struct fw3_zone *zone) -{ - fw3_free_list(&zone->networks); - fw3_free_list(&zone->devices); - fw3_free_list(&zone->subnets); + if (!running || z->running_list.next) + return z; - fw3_free_list(&zone->masq_src); - fw3_free_list(&zone->masq_dest); + break; + } - free(zone); + return NULL; }