zone-policy: T2199: Migrate zone-policy to firewall node

4 files changed, 81 insertions, 160 deletions

diff --git a/data/templates/firewall/nftables-zone.j2 b/data/templates/firewall/nftables-zone.j2
new file mode 100644
index 000000000..919881e19
--- /dev/null
+++ b/data/templates/firewall/nftables-zone.j2
@@ -0,0 +1,72 @@
+
+{% macro zone_chains(zone, state_policy=False, ipv6=False) %}
+{% set fw_name = 'ipv6_name' if ipv6 else 'name' %}
+{% set suffix = '6' if ipv6 else '' %}
+    chain VYOS_ZONE_FORWARD {
+        type filter hook forward priority 1; policy accept;
+{% if state_policy %}
+        jump VYOS_STATE_POLICY{{ suffix }}
+{% endif %}
+{% for zone_name, zone_conf in zone.items() %}
+{%     if 'local_zone' not in zone_conf %}
+        oifname { {{ zone_conf.interface | join(',') }} } counter jump VZONE_{{ zone_name }}
+{%     endif %}
+{% endfor %}
+    }
+    chain VYOS_ZONE_LOCAL {
+        type filter hook input priority 1; policy accept;
+{% if state_policy %}
+        jump VYOS_STATE_POLICY{{ suffix }}
+{% endif %}
+{% for zone_name, zone_conf in zone.items() %}
+{%     if 'local_zone' in zone_conf %}
+        counter jump VZONE_{{ zone_name }}_IN
+{%     endif %}
+{% endfor %}
+    }
+    chain VYOS_ZONE_OUTPUT {
+        type filter hook output priority 1; policy accept;
+{% if state_policy %}
+        jump VYOS_STATE_POLICY{{ suffix }}
+{% endif %}
+{% for zone_name, zone_conf in zone.items() %}
+{%     if 'local_zone' in zone_conf %}
+        counter jump VZONE_{{ zone_name }}_OUT
+{%     endif %}
+{% endfor %}
+    }
+{% for zone_name, zone_conf in zone.items() %}
+{%     if zone_conf.local_zone is vyos_defined %}
+    chain VZONE_{{ zone_name }}_IN {
+        iifname lo counter return
+{%         for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall[fw_name] is vyos_defined %}
+        iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME{{ suffix }}_{{ from_conf.firewall[fw_name] }}
+        iifname { {{ zone[from_zone].interface | join(",") }} } counter return
+{%         endfor %}
+        {{ zone_conf | nft_default_rule('zone_' + zone_name) }}
+    }
+    chain VZONE_{{ zone_name }}_OUT {
+        oifname lo counter return
+{%         for from_zone, from_conf in zone_conf.from_local.items() if from_conf.firewall[fw_name] is vyos_defined %}
+        oifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME{{ suffix }}_{{ from_conf.firewall[fw_name] }}
+        oifname { {{ zone[from_zone].interface | join(",") }} } counter return
+{%         endfor %}
+        {{ zone_conf | nft_default_rule('zone_' + zone_name) }}
+    }
+{%     else %}
+    chain VZONE_{{ zone_name }} {
+        iifname { {{ zone_conf.interface | join(",") }} } counter {{ zone_conf | nft_intra_zone_action(ipv6) }}
+{%         if zone_conf.intra_zone_filtering is vyos_defined %}
+        iifname { {{ zone_conf.interface | join(",") }} } counter return
+{%         endif %}
+{%         for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall[fw_name] is vyos_defined %}
+{%             if zone[from_zone].local_zone is not defined %}
+        iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME{{ suffix }}_{{ from_conf.firewall[fw_name] }}
+        iifname { {{ zone[from_zone].interface | join(",") }} } counter return
+{%             endif %}
+{%         endfor %}
+        {{ zone_conf | nft_default_rule('zone_' + zone_name) }}
+    }
+{%     endif %}
+{% endfor %}
+{% endmacro %}
diff --git a/data/templates/firewall/nftables.j2 b/data/templates/firewall/nftables.j2
index dde88d09d..c0780dad5 100644
--- a/data/templates/firewall/nftables.j2
+++ b/data/templates/firewall/nftables.j2
@@ -1,6 +1,7 @@
 #!/usr/sbin/nft -f
 
 {% import 'firewall/nftables-defines.j2' as group_tmpl %}
+{% import 'firewall/nftables-zone.j2' as zone_tmpl %}
 
 {% if first_install is not vyos_defined %}
 delete table ip vyos_filter
@@ -93,6 +94,10 @@ table ip vyos_filter {
 
 {{ group_tmpl.groups(group, False) }}
 
+{% if zone is vyos_defined %}
+{{ zone_tmpl.zone_chains(zone, state_policy is vyos_defined, False) }}
+{% endif %}
+
 {% if state_policy is vyos_defined %}
     chain VYOS_STATE_POLICY {
 {%     if state_policy.established is vyos_defined %}
@@ -107,9 +112,6 @@ table ip vyos_filter {
         return
     }
 {% endif %}
-{% if zone_conf is vyos_defined %}
-    include "{{ zone_conf }}"
-{% endif %}
 }
 
 {% if first_install is not vyos_defined %}
@@ -195,6 +197,10 @@ table ip6 vyos_filter {
 
 {{ group_tmpl.groups(group, True) }}
 
+{% if zone is vyos_defined %}
+{{ zone_tmpl.zone_chains(zone, state_policy is vyos_defined, True) }}
+{% endif %}
+
 {% if state_policy is vyos_defined %}
     chain VYOS_STATE_POLICY6 {
 {%     if state_policy.established is vyos_defined %}
@@ -209,7 +215,4 @@ table ip6 vyos_filter {
         return
     }
 {% endif %}
-{% if zone6_conf is vyos_defined %}
-    include "{{ zone6_conf }}"
-{% endif %}
 }
diff --git a/data/templates/zone_policy/nftables.j2 b/data/templates/zone_policy/nftables.j2
deleted file mode 100644
index 09140519f..000000000
--- a/data/templates/zone_policy/nftables.j2
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/sbin/nft -f
-
-{% if zone is vyos_defined %}
-    chain VYOS_ZONE_FORWARD {
-        type filter hook forward priority -1; policy accept;
-{%     if firewall.state_policy is vyos_defined %}
-        jump VYOS_STATE_POLICY
-{%     endif %}
-{%     for zone_name, zone_conf in zone.items() %}
-{%         if zone_conf.ipv4 %}
-{%             if 'local_zone' not in zone_conf %}
-        oifname { {{ zone_conf.interface | join(',') }} } counter jump VZONE_{{ zone_name }}
-{%             endif %}
-{%         endif %}
-{%     endfor %}
-    }
-    chain VYOS_ZONE_LOCAL {
-        type filter hook input priority -1; policy accept;
-{%     if firewall.state_policy is vyos_defined %}
-        jump VYOS_STATE_POLICY
-{%     endif %}
-{%     for zone_name, zone_conf in zone.items() %}
-{%         if zone_conf.ipv4 %}
-{%             if 'local_zone' in zone_conf %}
-        counter jump VZONE_{{ zone_name }}_IN
-{%             endif %}
-{%         endif %}
-{%     endfor %}
-    }
-    chain VYOS_ZONE_OUTPUT {
-        type filter hook output priority -1; policy accept;
-{%     if firewall.state_policy is vyos_defined %}
-        jump VYOS_STATE_POLICY
-{%     endif %}
-{%     for zone_name, zone_conf in zone.items() %}
-{%         if zone_conf.ipv4 %}
-{%             if 'local_zone' in zone_conf %}
-        counter jump VZONE_{{ zone_name }}_OUT
-{%             endif %}
-{%         endif %}
-{%     endfor %}
-    }
-{%     for zone_name, zone_conf in zone.items() if zone_conf.ipv4 %}
-{%         if zone_conf.local_zone is vyos_defined %}
-    chain VZONE_{{ zone_name }}_IN {
-        iifname lo counter return
-{%             for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.name is vyos_defined %}
-        iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME_{{ from_conf.firewall.name }}
-        iifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%             endfor %}
-        {{ zone_conf | nft_default_rule('zone_' + zone_name) }}
-    }
-    chain VZONE_{{ zone_name }}_OUT {
-        oifname lo counter return
-{%             for from_zone, from_conf in zone_conf.from_local.items() if from_conf.firewall.name is vyos_defined %}
-        oifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME_{{ from_conf.firewall.name }}
-        oifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%             endfor %}
-        {{ zone_conf | nft_default_rule('zone_' + zone_name) }}
-    }
-{%         else %}
-    chain VZONE_{{ zone_name }} {
-        iifname { {{ zone_conf.interface | join(",") }} } counter {{ zone_conf | nft_intra_zone_action(ipv6=False) }}
-{%             if zone_conf.intra_zone_filtering is vyos_defined %}
-        iifname { {{ zone_conf.interface | join(",") }} } counter return
-{%             endif %}
-{%             for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.name is vyos_defined %}
-{%                 if zone[from_zone].local_zone is not defined %}
-        iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME_{{ from_conf.firewall.name }}
-        iifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%                 endif %}
-{%             endfor %}
-        {{ zone_conf | nft_default_rule('zone_' + zone_name) }}
-    }
-{%         endif %}
-{%     endfor %}
-{% endif %}
diff --git a/data/templates/zone_policy/nftables6.j2 b/data/templates/zone_policy/nftables6.j2
deleted file mode 100644
index f7123d63d..000000000
--- a/data/templates/zone_policy/nftables6.j2
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/sbin/nft -f
-
-{% if zone is vyos_defined %}
-    chain VYOS_ZONE6_FORWARD {
-        type filter hook forward priority -1; policy accept;
-{%     if state_policy is vyos_defined %}
-        jump VYOS_STATE_POLICY6
-{%     endif %}
-{%     for zone_name, zone_conf in zone.items() %}
-{%         if zone_conf.ipv6 %}
-{%             if 'local_zone' not in zone_conf %}
-        oifname { {{ zone_conf.interface | join(',') }} } counter jump VZONE6_{{ zone_name }}
-{%             endif %}
-{%         endif %}
-{%     endfor %}
-    }
-    chain VYOS_ZONE6_LOCAL {
-        type filter hook input priority -1; policy accept;
-{%     if firewall.state_policy is vyos_defined %}
-        jump VYOS_STATE_POLICY6
-{%     endif %}
-{%     for zone_name, zone_conf in zone.items() %}
-{%         if zone_conf.ipv6 %}
-{%             if 'local_zone' in zone_conf %}
-        counter jump VZONE6_{{ zone_name }}_IN
-{%             endif %}
-{%         endif %}
-{%     endfor %}
-    }
-    chain VYOS_ZONE6_OUTPUT {
-        type filter hook output priority -1; policy accept;
-{%     if firewall.state_policy is vyos_defined %}
-        jump VYOS_STATE_POLICY6
-{%     endif %}
-{%     for zone_name, zone_conf in zone.items() %}
-{%         if zone_conf.ipv6 %}
-{%             if 'local_zone' in zone_conf %}
-        counter jump VZONE6_{{ zone_name }}_OUT
-{%             endif %}
-{%         endif %}
-{%     endfor %}
-    }
-{%     for zone_name, zone_conf in zone.items() if zone_conf.ipv6 %}
-{%         if zone_conf.local_zone is vyos_defined %}
-    chain VZONE6_{{ zone_name }}_IN {
-        iifname lo counter return
-{%             for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.ipv6_name is vyos_defined %}
-        iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME6_{{ from_conf.firewall.ipv6_name }}
-        iifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%             endfor %}
-        {{ zone_conf | nft_default_rule('zone6_' + zone_name) }}
-    }
-    chain VZONE6_{{ zone_name }}_OUT {
-        oifname lo counter return
-{%             for from_zone, from_conf in zone_conf.from_local.items() if from_conf.firewall.ipv6_name is vyos_defined %}
-        oifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME6_{{ from_conf.firewall.ipv6_name }}
-        oifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%             endfor %}
-        {{ zone_conf | nft_default_rule('zone6_' + zone_name) }}
-    }
-{%         else %}
-    chain VZONE6_{{ zone_name }} {
-        iifname { {{ zone_conf.interface | join(",") }} } counter {{ zone_conf | nft_intra_zone_action(ipv6=True) }}
-{%             if zone_conf.intra_zone_filtering is vyos_defined %}
-        iifname { {{ zone_conf.interface | join(",") }} } counter return
-{%             endif %}
-{%             for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.ipv6_name is vyos_defined %}
-{%                 if zone[from_zone].local_zone is not defined %}
-        iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME6_{{ from_conf.firewall.ipv6_name }}
-        iifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%                 endif %}
-{%             endfor %}
-        {{ zone_conf | nft_default_rule('zone6_' + zone_name) }}
-    }
-{%         endif %}
-{%     endfor %}
-{% endif %}