diff options
| author | Nicolas Fort <nicolasfort1988@gmail.com> | 2024-03-05 10:54:37 +0000 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-03-06 04:32:36 +0000 |
| commit | 2f232841a544fb3d602831cf0b2c95c447a245ea (patch) | |
| tree | 578a39b37e65f9495fc58cc6aa1d5feb4a901aa7 | |
| parent | cf906599a9ce99fce04645c822093a0eab980c97 (diff) | |
| download | vyos-1x-2f232841a544fb3d602831cf0b2c95c447a245ea.tar.gz vyos-1x-2f232841a544fb3d602831cf0b2c95c447a245ea.zip | |
T6061: fix rule parsing when connection-status is used
(cherry picked from commit 8f2534e9654b61b7db45788bb52ac6cf8017b054)
| -rw-r--r-- | python/vyos/firewall.py | 4 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_firewall.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python/vyos/firewall.py b/python/vyos/firewall.py index 49e095946..e70b4f0d9 100644 --- a/python/vyos/firewall.py +++ b/python/vyos/firewall.py @@ -136,10 +136,10 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): if 'connection_status' in rule_conf and rule_conf['connection_status']: status = rule_conf['connection_status'] if status['nat'] == 'destination': - nat_status = '{dnat}' + nat_status = 'dnat' output.append(f'ct status {nat_status}') if status['nat'] == 'source': - nat_status = '{snat}' + nat_status = 'snat' output.append(f'ct status {nat_status}') if 'protocol' in rule_conf and rule_conf['protocol'] != 'all': diff --git a/smoketest/scripts/cli/test_firewall.py b/smoketest/scripts/cli/test_firewall.py index be5960bbd..9e8473fa4 100755 --- a/smoketest/scripts/cli/test_firewall.py +++ b/smoketest/scripts/cli/test_firewall.py @@ -629,8 +629,8 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase): nftables_search = [ ['ct state { established, related }', 'accept'], ['ct state invalid', 'reject'], - ['ct state new', 'ct status == dnat', 'accept'], - ['ct state { established, new }', 'ct status == snat', 'accept'], + ['ct state new', 'ct status dnat', 'accept'], + ['ct state { established, new }', 'ct status snat', 'accept'], ['ct state related', 'ct helper { "ftp", "pptp" }', 'accept'], ['drop', f'comment "{name} default-action drop"'], ['jump VYOS_STATE_POLICY'], |