ruleset: correct mangle_output chain type

[project/firewall4.git] / root / usr / share / firewall4 / templates / ruleset.uc

diff --git a/root/usr/share/firewall4/templates/ruleset.uc b/root/usr/share/firewall4/templates/ruleset.uc
index 56d18ec1007bbc830a739f788e03338af5d26892..faf8bed808798f37808b6e9665011d1513b038a3 100644 (file)
--- a/root/usr/share/firewall4/templates/ruleset.uc
+++ b/root/usr/share/firewall4/templates/ruleset.uc
@@ -1,15 +1,20 @@
+{% let flowtable_devices = fw4.resolve_offload_devices(); -%}
+
 table inet fw4
 flush table inet fw4
+{% if (fw4.check_flowtable()): %}
+delete flowtable inet fw4 ft
+{% endif %}
 
 table inet fw4 {
-{% if (fw4.default_option("flow_offloading") && length(devices) > 0): %}
+{% if (length(flowtable_devices) > 0): %}
        #
        # Flowtable
        #
 
        flowtable ft {
                hook ingress priority 0;
-               devices = {{ fw4.set(devices, true) }};
+               devices = {{ fw4.set(flowtable_devices, true) }};
 {% if (fw4.default_option("flow_offloading_hw")): %}
                flags offload;
 {% endif %}
@@ -31,6 +36,7 @@ table inet fw4 {
 {% endif %}
 {%  if (set.interval): %}
                flags interval
+               auto-merge
 {%  endif %}
 {%  fw4.print_setentries(set) %}
        }
@@ -70,14 +76,14 @@ table inet fw4 {
 {% if (fw4.default_option("drop_invalid")): %}
                ct state invalid drop comment "!fw4: Drop flows with invalid conntrack state"
 {% endif %}
-{% if (fw4.default_option("synflood_protect")): %}
+{% if (fw4.default_option("synflood_protect") && fw4.default_option("synflood_rate")): %}
                tcp flags & (fin | syn | rst | ack) == syn jump syn_flood comment "!fw4: Rate limit TCP syn packets"
 {% endif %}
 {% for (let rule in fw4.rules("input")): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {% endfor %}
 {% for (let zone in fw4.zones()): for (let rule in zone.match_rules): %}
-               {%+ include("zone-match.uc", { fw4, zone, rule, direction: "input" }) %}
+               {%+ include("zone-jump.uc", { fw4, zone, rule, direction: "input" }) %}
 {% endfor; endfor %}
 {% if (fw4.input_policy() == "reject"): %}
                jump handle_reject
@@ -87,7 +93,7 @@ table inet fw4 {
        chain forward {
                type filter hook forward priority filter; policy {{ fw4.forward_policy(true) }};
 
-{% if (fw4.default_option("flow_offloading") && length(devices) > 0): %}
+{% if (length(flowtable_devices) > 0): %}
                meta l4proto { tcp, udp } flow offload @ft;
 {% endif %}
                ct state established,related accept comment "!fw4: Allow forwarded established and related flows"
@@ -98,7 +104,7 @@ table inet fw4 {
                {%+ include("rule.uc", { fw4, rule }) %}
 {% endfor %}
 {% for (let zone in fw4.zones()): for (let rule in zone.match_rules): %}
-               {%+ include("zone-match.uc", { fw4, zone, rule, direction: "forward" }) %}
+               {%+ include("zone-jump.uc", { fw4, zone, rule, direction: "forward" }) %}
 {% endfor; endfor %}
 {% if (fw4.forward_policy() == "reject"): %}
                jump handle_reject
@@ -118,7 +124,7 @@ table inet fw4 {
                {%+ include("rule.uc", { fw4, rule }) %}
 {% endfor %}
 {% for (let zone in fw4.zones()): for (let rule in zone.match_rules): %}
-               {%+ include("zone-match.uc", { fw4, zone, rule, direction: "output" }) %}
+               {%+ include("zone-jump.uc", { fw4, zone, rule, direction: "output" }) %}
 {% endfor; endfor %}
 {% if (fw4.output_policy() == "reject"): %}
                jump handle_reject
@@ -128,23 +134,22 @@ table inet fw4 {
        chain handle_reject {
                meta l4proto tcp reject with {{
                        (fw4.default_option("tcp_reject_code") != "tcp-reset")
-                               ? "icmpx type " + fw4.default_option("tcp_reject_code")
+                               ? `icmpx type ${fw4.default_option("tcp_reject_code")}`
                                : "tcp reset"
                }} comment "!fw4: Reject TCP traffic"
                reject with {{
                        (fw4.default_option("any_reject_code") != "tcp-reset")
-                               ? "icmpx type " + fw4.default_option("any_reject_code")
+                               ? `icmpx type ${fw4.default_option("any_reject_code")}`
                                : "tcp reset"
                }} comment "!fw4: Reject any other traffic"
        }
 
-{% if (fw4.default_option("synflood_protect")):
+{% if (fw4.default_option("synflood_protect") && fw4.default_option("synflood_rate")):
        let r = fw4.default_option("synflood_rate");
        let b = fw4.default_option("synflood_burst");
 %}
        chain syn_flood {
-               tcp flags & (fin | syn | rst | ack) == syn
-               {%- if (r): %} limit rate {{ r.rate }}/{{ r.unit }}{% endif %}
+               limit rate {{ r.rate }}/{{ r.unit }}
                {%- if (b): %} burst {{ b }} packets{% endif %} return comment "!fw4: Accept SYN packets below rate-limit"
                drop comment "!fw4: Drop excess packets"
        }
@@ -152,7 +157,7 @@ table inet fw4 {
 {% endif %}
 {% for (let zone in fw4.zones()): %}
        chain input_{{ zone.name }} {
-{%  for (let rule in fw4.rules("input_"+zone.name)): %}
+{%  for (let rule in fw4.rules(`input_${zone.name}`)): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {%  endfor %}
 {%  if (zone.dflags.dnat): %}
@@ -162,14 +167,14 @@ table inet fw4 {
        }
 
        chain output_{{ zone.name }} {
-{%  for (let rule in fw4.rules("output_"+zone.name)): %}
+{%  for (let rule in fw4.rules(`output_${zone.name}`)): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {%  endfor %}
                jump {{ zone.output }}_to_{{ zone.name }}
        }
 
        chain forward_{{ zone.name }} {
-{%  for (let rule in fw4.rules("forward_"+zone.name)): %}
+{%  for (let rule in fw4.rules(`forward_${zone.name}`)): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {%  endfor %}
 {%  if (zone.dflags.dnat): %}
@@ -207,7 +212,7 @@ table inet fw4 {
 {% for (let zone in fw4.zones()): %}
 {%  if (zone.dflags.dnat): %}
 {%   for (let rule in zone.match_rules): %}
-               {%+ include("zone-match.uc", { fw4, zone, rule, direction: "dstnat" }) %}
+               {%+ include("zone-jump.uc", { fw4, zone, rule, direction: "dstnat" }) %}
 {%   endfor %}
 {%  endif %}
 {% endfor %}
@@ -221,7 +226,7 @@ table inet fw4 {
 {% for (let zone in fw4.zones()): %}
 {%  if (zone.dflags.snat): %}
 {%   for (let rule in zone.match_rules): %}
-               {%+ include("zone-match.uc", { fw4, zone, rule, direction: "srcnat" }) %}
+               {%+ include("zone-jump.uc", { fw4, zone, rule, direction: "srcnat" }) %}
 {%   endfor %}
 {%  endif %}
 {% endfor %}
@@ -230,38 +235,30 @@ table inet fw4 {
 {% for (let zone in fw4.zones()): %}
 {%  if (zone.dflags.dnat): %}
        chain dstnat_{{ zone.name }} {
-{% for (let redirect in fw4.redirects("dstnat_"+zone.name)): %}
+{%   for (let redirect in fw4.redirects(`dstnat_${zone.name}`)): %}
                {%+ include("redirect.uc", { fw4, redirect }) %}
-{% endfor %}
+{%   endfor %}
        }
 
 {%  endif %}
 {%  if (zone.dflags.snat): %}
        chain srcnat_{{ zone.name }} {
-{% for (let redirect in fw4.redirects("srcnat_"+zone.name)): %}
+{%   for (let redirect in fw4.redirects(`srcnat_${zone.name}`)): %}
                {%+ include("redirect.uc", { fw4, redirect }) %}
-{% endfor %}
+{%   endfor %}
 {%   if (zone.masq): %}
-               meta nfproto ipv4 {%+ if (zone.masq4_src_pos): -%}
-                       ip saddr {{ fw4.set(zone.masq4_src_pos) }} {%+ endif -%}
-               {%+ if (zone.masq4_src_neg): -%}
-                       ip saddr != {{ fw4.set(zone.masq4_src_neg) }} {%+ endif -%}
-               {%+ if (zone.masq4_dest_pos): -%}
-                       ip daddr {{ fw4.set(zone.masq4_dest_pos) }} {%+ endif -%}
-               {%+ if (zone.masq4_dest_neg): -%}
-                       ip daddr != {{ fw4.set(zone.masq4_dest_neg) }} {%+ endif -%}
-               masquerade comment "!fw4: Masquerade IPv4 {{ zone.name }} traffic"
+{%    for (let saddrs in zone.masq4_src_subnets): %}
+{%     for (let daddrs in zone.masq4_dest_subnets): %}
+               {%+ include("zone-masq.uc", { fw4, zone, family: 4, saddrs, daddrs }) %}
+{%     endfor %}
+{%    endfor %}
 {%   endif %}
 {%   if (zone.masq6): %}
-               meta nfproto ipv6 {%+ if (zone.masq6_src_pos): -%}
-                       ip6 saddr {{ fw4.set(zone.masq6_src_pos) }} {%+ endif -%}
-               {%+ if (zone.masq6_src_neg): -%}
-                       ip6 saddr != {{ fw4.set(zone.masq6_src_neg) }} {%+ endif -%}
-               {%+ if (zone.masq6_dest_pos): -%}
-                       ip6 daddr {{ fw4.set(zone.masq6_dest_pos) }} {%+ endif -%}
-               {%+ if (zone.masq6_dest_neg): -%}
-                       ip6 daddr != {{ fw4.set(zone.masq6_dest_neg) }} {%+ endif -%}
-               masquerade comment "!fw4: Masquerade IPv6 {{ zone.name }} traffic"
+{%    for (let saddrs in zone.masq6_src_subnets): %}
+{%     for (let daddrs in zone.masq6_dest_subnets): %}
+               {%+ include("zone-masq.uc", { fw4, zone, family: 6, saddrs, daddrs }) %}
+{%     endfor %}
+{%    endfor %}
 {%   endif %}
        }
 
@@ -278,19 +275,12 @@ table inet fw4 {
 {%  for (let zone in fw4.zones()): %}
 {%   if (zone.dflags[target]): %}
 {%    for (let rule in zone.match_rules): %}
-{%     let devs = fw4.filter_loopback_devs(rule.devices_pos, false); %}
-{%     let nets = fw4.filter_loopback_addrs(rule.subnets_pos, false); %}
-{%     if (rule.devices_neg || rule.subnets_neg || length(devs) || length(nets)): %}
+{%     let devices_pos = fw4.filter_loopback_devs(rule.devices_pos, false); %}
+{%     let subnets_pos = fw4.filter_loopback_addrs(rule.subnets_pos, false); %}
+{%     if (rule.devices_neg || rule.subnets_neg || devices_pos || subnets_pos): %}
                {%+ if (rule.family): -%}
                        meta nfproto {{ fw4.nfproto(rule.family) }} {%+ endif -%}
-               {%+ if (length(devs)): -%}
-                       iifname {{ fw4.set(devs) }} {%+ endif -%}
-               {%+ if (rule.devices_neg): -%}
-                       iifname != {{ fw4.set(rule.devices_neg) }} {%+ endif -%}
-               {%+ if (length(nets)): -%}
-                       {{ fw4.ipproto(rule.family) }} saddr {{ fw4.set(nets) }} {%+ endif -%}
-               {%+ if (rule.subnets_neg): -%}
-                       {{ fw4.ipproto(rule.family) }} saddr != {{ fw4.set(rule.subnets_neg) }} {%+ endif -%}
+               {%+ include("zone-match.uc", { fw4, egress: false, rule: { ...rule, devices_pos, subnets_pos } }) -%}
                jump {{ target }}_{{ zone.name }} comment "!fw4: {{ zone.name }} {{ fw4.nfproto(rule.family, true) }} {{
                        (target == "helper") ? "CT helper assignment" : "CT bypass"
                }}"
@@ -307,15 +297,12 @@ table inet fw4 {
 {%  for (let zone in fw4.zones()): %}
 {%   if (zone.dflags[target]): %}
 {%    for (let rule in zone.match_rules): %}
-{%     let devs = fw4.filter_loopback_devs(rule.devices_pos, true); %}
-{%     let nets = fw4.filter_loopback_addrs(rule.subnets_pos, true); %}
-{%     if (length(devs) || length(nets)): %}
+{%     let devices_pos = fw4.filter_loopback_devs(rule.devices_pos, true); %}
+{%     let subnets_pos = fw4.filter_loopback_addrs(rule.subnets_pos, true); %}
+{%     if (devices_pos || subnets_pos): %}
                {%+ if (rule.family): -%}
                        meta nfproto {{ fw4.nfproto(rule.family) }} {%+ endif -%}
-               {%+ if (length(devs)): -%}
-                       iifname {{ fw4.set(devs) }} {%+ endif -%}
-               {%+ if (length(nets)): -%}
-                       {{ fw4.ipproto(rule.family) }} saddr {{ fw4.set(nets) }} {%+ endif -%}
+               {%+ include("zone-match.uc", { fw4, egress: false, rule: { ...rule, devices_pos, subnets_pos } }) -%}
                jump {{ target }}_{{ zone.name }} comment "!fw4: {{ zone.name }} {{ fw4.nfproto(rule.family, true) }} {{
                        (target == "helper") ? "CT helper assignment" : "CT bypass"
                }}"
@@ -340,7 +327,7 @@ table inet fw4 {
 {%  for (let zone in fw4.zones()): %}
 {%   if (zone.dflags[target]): %}
        chain {{ target }}_{{ zone.name }} {
-{% for (let rule in fw4.rules(target+"_"+zone.name)): %}
+{% for (let rule in fw4.rules(`${target}_${zone.name}`)): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {% endfor %}
        }
@@ -360,8 +347,22 @@ table inet fw4 {
 {% endfor %}
        }
 
+       chain mangle_postrouting {
+               type filter hook postrouting priority mangle; policy accept;
+{% for (let rule in fw4.rules("mangle_postrouting")): %}
+               {%+ include("rule.uc", { fw4, rule }) %}
+{% endfor %}
+       }
+
+       chain mangle_input {
+               type filter hook input priority mangle; policy accept;
+{% for (let rule in fw4.rules("mangle_input")): %}
+               {%+ include("rule.uc", { fw4, rule }) %}
+{% endfor %}
+       }
+
        chain mangle_output {
-               type filter hook output priority mangle; policy accept;
+               type route hook output priority mangle; policy accept;
 {% for (let rule in fw4.rules("mangle_output")): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {% endfor %}
@@ -369,6 +370,9 @@ table inet fw4 {
 
        chain mangle_forward {
                type filter hook forward priority mangle; policy accept;
+{% for (let rule in fw4.rules("mangle_forward")): %}
+               {%+ include("rule.uc", { fw4, rule }) %}
+{% endfor %}
 {% for (let zone in fw4.zones()): %}
 {%  if (zone.mtu_fix): %}
 {%   for (let rule in zone.match_rules): %}