diff options
| author | Mark Hayes <mark.hayes0338@gmail.com> | 2025-04-25 11:10:07 -0400 |
|---|---|---|
| committer | Mark Hayes <mark.hayes0338@gmail.com> | 2025-05-07 10:55:00 -0400 |
| commit | 02c63e7ded23ea90d55638f768ff943671c2c574 (patch) | |
| tree | c4b3c03e67fb28b1d77cc6ac6e69d9796a2293f2 /src/op_mode/firewall.py | |
| parent | af2ddd56efc8aa4f8b1f417780de70bcce45cb89 (diff) | |
| download | vyos-1x-02c63e7ded23ea90d55638f768ff943671c2c574.tar.gz vyos-1x-02c63e7ded23ea90d55638f768ff943671c2c574.zip | |
T7386: firewall: allow mix of IPv4 and IPv6 addresses/prefixes/ranges in remote groups
Diffstat (limited to 'src/op_mode/firewall.py')
| -rwxr-xr-x | src/op_mode/firewall.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py index ac47e3273..2ad968c96 100755 --- a/src/op_mode/firewall.py +++ b/src/op_mode/firewall.py @@ -648,12 +648,14 @@ def show_firewall_group(name=None): references = find_references(group_type, remote_name) row = [remote_name, textwrap.fill(remote_conf.get('description') or '', 50), group_type, '\n'.join(references) or 'N/D'] members = get_nftables_remote_group_members("ipv4", 'vyos_filter', f'R_{remote_name}') + members6 = get_nftables_remote_group_members("ipv6", 'vyos_filter', f'R6_{remote_name}') if 'url' in remote_conf: # display only the url if no members are found for both views - if not members: + if not members and not members6: if args.detail: - header_tail = ['Remote URL'] + header_tail = ['IPv6 Members', 'Remote URL'] + row.append('N/D') row.append('N/D') row.append(remote_conf['url']) else: @@ -662,8 +664,15 @@ def show_firewall_group(name=None): else: # display all table elements in detail view if args.detail: - header_tail = ['Remote URL'] - row += [' '.join(members)] + header_tail = ['IPv6 Members', 'Remote URL'] + if members: + row.append(' '.join(members)) + else: + row.append('N/D') + if members6: + row.append(' '.join(members6)) + else: + row.append('N/D') row.append(remote_conf['url']) rows.append(row) else: |