summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-09-12 21:13:21 +0200
committerGitHub <noreply@github.com>2024-09-12 21:13:21 +0200
commite0382e6ec214c28da52de6da946e8a4b44109481 (patch)
treeebdb050adcb557a8cf6ba462c0bc33bcf7b8efdd /src/conf_mode
parent265afe39e757a1648270603be52408a8271ed4cb (diff)
parent595f35bbdda732883ce0b8b0721061bb3a40a715 (diff)
downloadvyos-1x-e0382e6ec214c28da52de6da946e8a4b44109481.tar.gz
vyos-1x-e0382e6ec214c28da52de6da946e8a4b44109481.zip
Merge pull request #4047 from natali-rs1985/T6676-current
policy: T6676: Invalid route-map caused bgpd to crash
Diffstat (limited to 'src/conf_mode')
-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',