diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-14 17:26:14 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-02-14 17:26:14 +0100 |
| commit | 97a901dce9be808e918a719b4298e201a9a98ceb (patch) | |
| tree | 27c70e1c442fbde4f7784ed6422b05923db928e2 /src | |
| parent | 580baddebb933ef388c7adabf4f4971c03decf5f (diff) | |
| download | vyos-1x-97a901dce9be808e918a719b4298e201a9a98ceb.tar.gz vyos-1x-97a901dce9be808e918a719b4298e201a9a98ceb.zip | |
frr: harden "router" regex
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/protocols_bgp.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_ospf.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py index 9021d58c8..54352460c 100755 --- a/src/conf_mode/protocols_bgp.py +++ b/src/conf_mode/protocols_bgp.py @@ -162,7 +162,7 @@ def apply(bgp): # Save original configuration prior to starting any commit actions frr_cfg = frr.FRRConfig() frr_cfg.load_configuration(frr_daemon) - frr_cfg.modify_section(f'router bgp \S+', '') + frr_cfg.modify_section(f'^router bgp \d+$', '') frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', bgp['new_frr_config']) frr_cfg.commit_configuration(frr_daemon) diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py index 5e0794fa0..2ce0ab530 100755 --- a/src/conf_mode/protocols_ospf.py +++ b/src/conf_mode/protocols_ospf.py @@ -138,7 +138,7 @@ def apply(ospf): frr_cfg = frr.FRRConfig() frr_cfg.load_configuration(frr_daemon) frr_cfg.modify_section(r'interface \S+', '') - frr_cfg.modify_section('router ospf', '') + frr_cfg.modify_section('^router ospf$', '') frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', ospf['new_frr_config']) frr_cfg.commit_configuration(frr_daemon) |