diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-01-16 22:38:43 +0100 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-01-17 12:28:12 +0100 |
| commit | ab4dd3b7a65d10a936071ee1bf0c5c2c884bb1f5 (patch) | |
| tree | e17da0b7d86f92db4a2576e217c02803a4682276 | |
| parent | 64668771d5f14fc4b68fff382d166238c164bdde (diff) | |
| download | vyos-1x-ab4dd3b7a65d10a936071ee1bf0c5c2c884bb1f5.tar.gz vyos-1x-ab4dd3b7a65d10a936071ee1bf0c5c2c884bb1f5.zip | |
zone-policy: T3873: Fix intra-zone-filtering return to zone default-action
| -rw-r--r-- | data/templates/zone_policy/nftables.tmpl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/data/templates/zone_policy/nftables.tmpl b/data/templates/zone_policy/nftables.tmpl index fae6e8c4f..e59208a0d 100644 --- a/data/templates/zone_policy/nftables.tmpl +++ b/data/templates/zone_policy/nftables.tmpl @@ -29,6 +29,9 @@ table ip filter { {% 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 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 defined %} {% if zone[from_zone].local_zone is not defined %} iifname { {{ zone[from_zone].interface | join(",") }} } counter jump {{ from_conf.firewall.name }} @@ -63,6 +66,9 @@ table ip6 filter { {% 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 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 defined %} {% if zone[from_zone].local_zone is not defined %} iifname { {{ zone[from_zone].interface | join(",") }} } counter jump {{ from_conf.firewall.ipv6_name }} |