diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-01-17 18:08:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 18:08:34 +0100 |
| commit | 9fb2e1432209f907d6e5e3ce748da243c85f2851 (patch) | |
| tree | 0f3607ccd75cfad67f25ba06b62bdaa1232874fb /python | |
| parent | 7e731c0ef503334eaab2bfd723163a9749d64da2 (diff) | |
| parent | 53c2b62dda5bcd1f605a8b9ea438f0f76e366e36 (diff) | |
| download | vyos-1x-9fb2e1432209f907d6e5e3ce748da243c85f2851.tar.gz vyos-1x-9fb2e1432209f907d6e5e3ce748da243c85f2851.zip | |
Merge pull request #1174 from sarthurdev/firewall
firewall: T4178: T3873: tcp flags syntax refactor, intra-zone-filtering fix
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/firewall.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/python/vyos/firewall.py b/python/vyos/firewall.py index acde9f913..ad84393df 100644 --- a/python/vyos/firewall.py +++ b/python/vyos/firewall.py @@ -185,14 +185,8 @@ def parse_rule(rule_conf, fw_name, rule_id, ip_name): return " ".join(output) def parse_tcp_flags(flags): - all_flags = [] - include = [] - for flag in flags.split(","): - if flag[0] == '!': - flag = flag[1:].lower() - else: - include.append(flag.lower()) - all_flags.append(flag.lower()) + include = [flag for flag in flags if flag != 'not'] + all_flags = include + [flag for flag in flags['not']] if 'not' in flags else [] return f'tcp flags & ({"|".join(all_flags)}) == {"|".join(include)}' def parse_time(time): |