summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-01-10 19:42:05 +0100
committerGitHub <noreply@github.com>2022-01-10 19:42:05 +0100
commit436805a69df324767c3efdf8d72127bef42fd720 (patch)
tree87aa749d7a4cb427d5b0b1d02a5c75474328f1c4 /src/conf_mode
parent4ade92549616aa122f228ed5a3f95ea89c5aa356 (diff)
parent67ab8154685638b373b139aaf9a936cbcb83a84f (diff)
downloadvyos-1x-436805a69df324767c3efdf8d72127bef42fd720.tar.gz
vyos-1x-436805a69df324767c3efdf8d72127bef42fd720.zip
Merge pull request #1151 from sarthurdev/firewall
firewall: policy: T4149: T4155: Fix incorrect table variable, fix handling of deleted base firewall node
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/firewall.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/conf_mode/firewall.py b/src/conf_mode/firewall.py
index 75382034f..0b4c0854f 100755
--- a/src/conf_mode/firewall.py
+++ b/src/conf_mode/firewall.py
@@ -104,9 +104,6 @@ def get_config(config=None):
conf = Config()
base = ['firewall']
- if not conf.exists(base):
- return {}
-
firewall = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True,
no_tag_node_value_mangle=True)
@@ -169,10 +166,6 @@ def verify_rule(firewall, rule_conf, ipv6):
raise ConfigError('Protocol must be tcp, udp, or tcp_udp when specifying a port or port-group')
def verify(firewall):
- # bail out early - looks like removal from running config
- if not firewall:
- return None
-
if 'config_trap' in firewall and firewall['config_trap'] == 'enable':
if not firewall['trap_targets']:
raise ConfigError(f'Firewall config-trap enabled but "service snmp trap-target" is not defined')