diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/firewall.py | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/src/conf_mode/firewall.py b/src/conf_mode/firewall.py index eacded5ef..32356f6d7 100755 --- a/src/conf_mode/firewall.py +++ b/src/conf_mode/firewall.py @@ -106,6 +106,24 @@ def geoip_updated(conf): return any(any(dict_search_recursive(diff.get(section, {}), 'geoip')) for section in ('add', 'delete')) +def generate_inet_proto_keymap(firewall): + """ + Build a keymap of IP protocol numbers to protocol names from + `nft describe inet_proto`. + + Returns: + dict[int, str]: Mapping of protocol number -> protocol name. + """ + keymap = {} + + for line in cmdl(['nft', 'describe', 'inet_proto']).splitlines(): + match = re.match(r'^\s*([A-Za-z0-9_.-]+)\s+(\d+)\s*$', line) + if match: + name, number = match.groups() + keymap[number] = name + + firewall['inet_proto_map'] = keymap + def get_config(config=None): if config: conf = config @@ -261,6 +279,17 @@ def verify_rule(firewall, family, hook, priority, rule_id, rule_conf): elif 'offload_target' in rule_conf: Warning(f'{rule_num}offload-target is specified but action is not set to "offload"') + if 'protocol' in rule_conf: + if rule_conf['protocol'].isdigit(): + if not dict_search('inet_proto_map', firewall): + generate_inet_proto_keymap(firewall) + rule_conf['protocol'] = dict_search(rule_conf['protocol'], firewall['inet_proto_map'], rule_conf['protocol']) + + if rule_conf['protocol'] == 'icmp' and family == 'ipv6': + raise ConfigError(f'{rule_num}Cannot match IPv4 ICMP protocol on IPv6, use ipv6-icmp') + if rule_conf['protocol'] == 'ipv6-icmp' and family == 'ipv4': + raise ConfigError(f'{rule_num}Cannot match IPv6 ICMP protocol on IPv4, use icmp') + if rule_conf['action'] != 'synproxy' and 'synproxy' in rule_conf: raise ConfigError(f'{rule_num}"synproxy" option allowed only for action synproxy') if rule_conf['action'] == 'synproxy': @@ -364,12 +393,6 @@ def verify_rule(firewall, family, hook, priority, rule_id, rule_conf): if duplicates: raise ConfigError(f'{rule_num}Cannot match a tcp flag as set and not set') - if 'protocol' in rule_conf: - if rule_conf['protocol'] == 'icmp' and family == 'ipv6': - raise ConfigError(f'{rule_num}Cannot match IPv4 ICMP protocol on IPv6, use ipv6-icmp') - if rule_conf['protocol'] == 'ipv6-icmp' and family == 'ipv4': - raise ConfigError(f'{rule_num}Cannot match IPv6 ICMP protocol on IPv4, use icmp') - for side in ['destination', 'source']: if side in rule_conf: side_conf = rule_conf[side] |