summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-09-13 16:00:07 +0100
committerGitHub <noreply@github.com>2024-09-13 16:00:07 +0100
commit97e58b54dc07c4dd10359794c0aeb95410745603 (patch)
treef72a85dd053144b6ddabe176469fc42f3c447d5e
parent205d957d092ade5708cc2182381864c04e4c0aff (diff)
parent6f657367e6ac5aeac0d71d75ba5e67f2d977412b (diff)
downloadvyos-1x-97e58b54dc07c4dd10359794c0aeb95410745603.tar.gz
vyos-1x-97e58b54dc07c4dd10359794c0aeb95410745603.zip
Merge pull request #4059 from vyos/mergify/bp/circinus/pr-4047
policy: T6676: Invalid route-map caused bgpd to crash (backport #4047)
-rwxr-xr-xsrc/conf_mode/policy.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/policy.py b/src/conf_mode/policy.py
index 4df893ebf..a5963e72c 100755
--- a/src/conf_mode/policy.py
+++ b/src/conf_mode/policy.py
@@ -167,10 +167,10 @@ def verify(policy):
continue
for rule, rule_config in route_map_config['rule'].items():
- # Action 'deny' cannot be used with "continue"
- # FRR does not validate it T4827
- if rule_config['action'] == 'deny' and 'continue' in rule_config:
- raise ConfigError(f'rule {rule} "continue" cannot be used with action deny!')
+ # Action 'deny' cannot be used with "continue" or "on-match"
+ # FRR does not validate it T4827, T6676
+ if rule_config['action'] == 'deny' and ('continue' in rule_config or 'on_match' in rule_config):
+ raise ConfigError(f'rule {rule} "continue" or "on-match" cannot be used with action deny!')
# Specified community-list must exist
tmp = dict_search('match.community.community_list',