diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-08-14 07:08:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-14 07:08:26 +0200 |
| commit | b9aa488683764efc9901b4ba1ae236f485b1c083 (patch) | |
| tree | a549ba2754448b7e4bde08bc0f7eea4468074c10 /python | |
| parent | c0583c996a041b9f13c3710d9555383ab54671a9 (diff) | |
| parent | 4d621da331de871f9596ca2b70a8857e22ef6c6f (diff) | |
| download | vyos-1x-b9aa488683764efc9901b4ba1ae236f485b1c083.tar.gz vyos-1x-b9aa488683764efc9901b4ba1ae236f485b1c083.zip | |
Merge pull request #5401 from ruben-herold/T9210-firewall-lib-ruff-cleanup
firewall: T9210: fix ruff findings in python/vyos/firewall.py
Diffstat (limited to 'python')
| -rwxr-xr-x | python/vyos/firewall.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/python/vyos/firewall.py b/python/vyos/firewall.py index ec95c5aaf..b8356717f 100755 --- a/python/vyos/firewall.py +++ b/python/vyos/firewall.py @@ -16,6 +16,7 @@ import re from socket import AF_INET from socket import AF_INET6 +from socket import gaierror from socket import getaddrinfo from vyos.template import is_ipv4 @@ -79,7 +80,7 @@ def fqdn_resolve(fqdn, ipv6=False): try: res = getaddrinfo(fqdn, None, AF_INET6 if ipv6 else AF_INET) return set(item[4][0] for item in res) - except: + except gaierror: return None def find_nftables_rule(table, chain, rule_matches=[]): @@ -219,7 +220,7 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): geoip_prefix = 'CC' if country_code else 'ASN' operator = '' hook_name = '' - if dict_search_args(side_conf, 'geoip', 'inverse_match') != None: + if dict_search_args(side_conf, 'geoip', 'inverse_match') is not None: operator = '!=' if hook == 'FWD': hook_name = 'forward' @@ -230,7 +231,7 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): if hook == 'PRE': hook_name = 'prerouting' if hook == 'NAM': - hook_name = f'name' + hook_name = 'name' # for policy if hook == 'route' or hook == 'route6': hook_name = hook @@ -409,7 +410,7 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): output.append(f'ip{def_suffix} length != {{{negated_lengths_str}}}') if 'packet_type' in rule_conf: - output.append(f'pkttype ' + rule_conf['packet_type']) + output.append('pkttype ' + rule_conf['packet_type']) if 'dscp' in rule_conf: dscp_str = ','.join(rule_conf['dscp']) @@ -550,7 +551,7 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): output.append(f'snaplen {log_snaplen}') if 'last_used' in rule_conf: - output.append(f'last') + output.append('last') output.append('counter') |