summaryrefslogtreecommitdiff
path: root/src/conf_mode/zone_policy.py
diff options
context:
space:
mode:
authorsarthurdev <965089+sarthurdev@users.noreply.github.com>2022-01-04 20:11:31 +0100
committersarthurdev <965089+sarthurdev@users.noreply.github.com>2022-01-05 00:14:31 +0100
commit459c7079bebe7059d90441a5014d948a92d2ee19 (patch)
treedc2c5c0466fb6e138f9f9484c9c3bd26c516cadd /src/conf_mode/zone_policy.py
parent993b87458456bc6fcbe5aa7fbc7c0c31580032ce (diff)
downloadvyos-1x-459c7079bebe7059d90441a5014d948a92d2ee19.tar.gz
vyos-1x-459c7079bebe7059d90441a5014d948a92d2ee19.zip
firewall: zone-policy: T2199: T4130: Fixes for firewall, state-policy and zone-policy
Diffstat (limited to 'src/conf_mode/zone_policy.py')
-rwxr-xr-xsrc/conf_mode/zone_policy.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/conf_mode/zone_policy.py b/src/conf_mode/zone_policy.py
index 2535ea33b..d605e9639 100755
--- a/src/conf_mode/zone_policy.py
+++ b/src/conf_mode/zone_policy.py
@@ -152,7 +152,9 @@ def cleanup_commands():
continue
for expr in item['rule']['expr']:
target = dict_search_args(expr, 'jump', 'target')
- if target and target.startswith("VZONE"):
+ if not target:
+ continue
+ if target.startswith("VZONE") or target.startswith("VYOS_STATE_POLICY"):
commands.append(f'delete rule {table} {chain} handle {handle}')
for item in obj['nftables']:
if 'chain' in item:
@@ -180,7 +182,7 @@ def generate(zone_policy):
def apply(zone_policy):
install_result = run(f'nft -f {nftables_conf}')
- if install_result == 1:
+ if install_result != 0:
raise ConfigError('Failed to apply zone-policy')
return None