firewall: T2199: Refactor firewall + zone-policy, move interfaces under firewall node

* Refactor firewall and zone-policy rule creation and cleanup
* Migrate interface firewall values to `firewall interfaces <name> <direction> name/ipv6-name <name>`
* Remove `firewall-interface.py` conf script

3 files changed, 179 insertions, 84 deletions

diff --git a/data/templates/firewall/nftables.j2 b/data/templates/firewall/nftables.j2
index 5971e1bbc..3beb7fb92 100644
--- a/data/templates/firewall/nftables.j2
+++ b/data/templates/firewall/nftables.j2
@@ -2,24 +2,46 @@
 
 {% import 'firewall/nftables-defines.j2' as group_tmpl %}
 
-{% if cleanup_commands is vyos_defined %}
-{%     for command in cleanup_commands %}
-{{ command }}
-{%     endfor %}
+{% if first_install is not vyos_defined %}
+delete table ip vyos_filter
 {% endif %}
-
 table ip filter {
-{% if first_install is vyos_defined %}
     chain VYOS_FW_FORWARD {
         type filter hook forward priority 0; policy accept;
+{% if state_policy is vyos_defined %}
+        jump VYOS_STATE_POLICY
+{% endif %}
+{% if interface is vyos_defined %}
+{%     for ifname, ifconf in interface.items() %}
+{%         if ifconf.in is vyos_defined and ifconf.in.name is vyos_defined %}
+        iifname {{ ifname }} counter jump NAME_{{ ifconf.in.name }}
+{%         endif %}
+{%         if ifconf.out is vyos_defined and ifconf.out.name is vyos_defined %}
+        oifname {{ ifname }} counter jump NAME_{{ ifconf.out.name }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
         jump VYOS_POST_FW
     }
     chain VYOS_FW_LOCAL {
         type filter hook input priority 0; policy accept;
+{% if state_policy is vyos_defined %}
+        jump VYOS_STATE_POLICY
+{% endif %}
+{% if interface is vyos_defined %}
+{%     for ifname, ifconf in interface.items() %}
+{%         if ifconf.local is vyos_defined and ifconf.local.name is vyos_defined %}
+        iifname {{ ifname }} counter jump NAME_{{ ifconf.local.name }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
         jump VYOS_POST_FW
     }
     chain VYOS_FW_OUTPUT {
         type filter hook output priority 0; policy accept;
+{% if state_policy is vyos_defined %}
+        jump VYOS_STATE_POLICY
+{% endif %}
         jump VYOS_POST_FW
     }
     chain VYOS_POST_FW {
@@ -29,7 +51,6 @@ table ip filter {
         type filter hook prerouting priority -450; policy accept;
         ip frag-off & 0x3fff != 0 meta mark set 0xffff1 return
     }
-{% endif %}
 {% if name is vyos_defined %}
 {%     set ns = namespace(sets=[]) %}
 {%     for name_text, conf in name.items() %}
@@ -86,20 +107,51 @@ table ip filter {
         return
     }
 {% endif %}
+{% if zone_conf is vyos_defined %}
+    include "{{ zone_conf }}"
+{% endif %}
 }
 
+{% if first_install is not vyos_defined %}
+delete table ip6 vyos_filter
+{% endif %}
 table ip6 filter {
-{% if first_install is vyos_defined %}
     chain VYOS_FW6_FORWARD {
         type filter hook forward priority 0; policy accept;
+{% if state_policy is vyos_defined %}
+        jump VYOS_STATE_POLICY6
+{% endif %}
+{% if interface is vyos_defined %}
+{%     for ifname, ifconf in interface.items() %}
+{%         if ifconf.in is vyos_defined and ifconf.in.ipv6_name is vyos_defined %}
+        iifname {{ ifname }} counter jump NAME6_{{ ifconf.in.ipv6_name }}
+{%         endif %}
+{%         if ifconf.out is vyos_defined and ifconf.out.ipv6_name is vyos_defined %}
+        oifname {{ ifname }} counter jump NAME6_{{ ifconf.out.ipv6_name }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
         jump VYOS_POST_FW6
     }
     chain VYOS_FW6_LOCAL {
         type filter hook input priority 0; policy accept;
+{% if state_policy is vyos_defined %}
+        jump VYOS_STATE_POLICY6
+{% endif %}
+{% if interface is vyos_defined %}
+{%     for ifname, ifconf in interface.items() %}
+{%         if ifconf.local is vyos_defined and ifconf.local.ipv6_name is vyos_defined %}
+        iifname {{ ifname }} counter jump NAME6_{{ ifconf.local.ipv6_name }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
         jump VYOS_POST_FW6
     }
     chain VYOS_FW6_OUTPUT {
         type filter hook output priority 0; policy accept;
+{% if state_policy is vyos_defined %}
+        jump VYOS_STATE_POLICY6
+{% endif %}
         jump VYOS_POST_FW6
     }
     chain VYOS_POST_FW6 {
@@ -109,7 +161,6 @@ table ip6 filter {
         type filter hook prerouting priority -450; policy accept;
         exthdr frag exists meta mark set 0xffff1 return
     }
-{% endif %}
 {% if ipv6_name is vyos_defined %}
 {%     set ns = namespace(sets=[]) %}
 {%     for name_text, conf in ipv6_name.items() %}
@@ -158,6 +209,9 @@ table ip6 filter {
         return
     }
 {% endif %}
+{% if zone6_conf is vyos_defined %}
+    include "{{ zone6_conf }}"
+{% endif %}
 }
 
 {% if first_install is vyos_defined %}
diff --git a/data/templates/zone_policy/nftables.j2 b/data/templates/zone_policy/nftables.j2
index fe941f9f8..09140519f 100644
--- a/data/templates/zone_policy/nftables.j2
+++ b/data/templates/zone_policy/nftables.j2
@@ -1,13 +1,45 @@
 #!/usr/sbin/nft -f
 
-{% if cleanup_commands is vyos_defined %}
-{%     for command in cleanup_commands %}
-{{ command }}
-{%     endfor %}
-{% endif %}
-
 {% if zone is vyos_defined %}
-table ip filter {
+    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 {
@@ -42,72 +74,4 @@ table ip filter {
     }
 {%         endif %}
 {%     endfor %}
-}
-
-table ip6 filter {
-{%     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 %}
-}
-
-{%     for zone_name, zone_conf in zone.items() %}
-{%         if zone_conf.ipv4 %}
-{%             if 'local_zone' in zone_conf %}
-insert rule ip filter VYOS_FW_LOCAL counter jump VZONE_{{ zone_name }}_IN
-insert rule ip filter VYOS_FW_OUTPUT counter jump VZONE_{{ zone_name }}_OUT
-{%             else %}
-insert rule ip filter VYOS_FW_FORWARD oifname { {{ zone_conf.interface | join(',') }} } counter jump VZONE_{{ zone_name }}
-{%             endif %}
-{%         endif %}
-{%         if zone_conf.ipv6 %}
-{%             if 'local_zone' in zone_conf %}
-insert rule ip6 filter VYOS_FW6_LOCAL counter jump VZONE6_{{ zone_name }}_IN
-insert rule ip6 filter VYOS_FW6_OUTPUT counter jump VZONE6_{{ zone_name }}_OUT
-{%             else %}
-insert rule ip6 filter VYOS_FW6_FORWARD oifname { {{ zone_conf.interface | join(',') }} } counter jump VZONE6_{{ zone_name }}
-{%             endif %}
-{%         endif %}
-{%     endfor %}
-
-{# Ensure that state-policy rule is first in the chain #}
-{%     if firewall.state_policy is vyos_defined %}
-{%         for chain in ['VYOS_FW_FORWARD', 'VYOS_FW_OUTPUT', 'VYOS_FW_LOCAL'] %}
-insert rule ip filter {{ chain }} jump VYOS_STATE_POLICY
-{%         endfor %}
-{%         for chain in ['VYOS_FW6_FORWARD', 'VYOS_FW6_OUTPUT', 'VYOS_FW6_LOCAL'] %}
-insert rule ip6 filter {{ chain }} jump VYOS_STATE_POLICY6
-{%         endfor %}
-{%     endif %}
-
 {% endif %}
diff --git a/data/templates/zone_policy/nftables6.j2 b/data/templates/zone_policy/nftables6.j2
new file mode 100644
index 000000000..f7123d63d
--- /dev/null
+++ b/data/templates/zone_policy/nftables6.j2
@@ -0,0 +1,77 @@
+#!/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 %}