diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-03 21:57:00 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-01-04 07:55:13 +0100 |
| commit | b152b52023ba0cf0d4919eae39e92de28a458917 (patch) | |
| tree | c8c6cdbdeccd48ff60a0ef6b0b6ed0d339687969 /src/conf_mode/interfaces_sstpc.py | |
| parent | 301312b293238d3041c8912af6fdb86b506d7ab4 (diff) | |
| download | vyos-1x-b152b52023ba0cf0d4919eae39e92de28a458917.tar.gz vyos-1x-b152b52023ba0cf0d4919eae39e92de28a458917.zip | |
configdict: T5894: add get_config_dict() flag with_pki
VyOS has several services relaying on the PKI CLI tree to retrieve certificates.
Consuming services like ethernet, openvpn or ipsec all re-implemented the same
code to retrieve the certificates from the CLI.
This commit extends the signature of get_config_dict() with a new option with_pki
that defaults to false. If this option is set, the PKI CLI tree will be blended
into the resulting dictionary.
Diffstat (limited to 'src/conf_mode/interfaces_sstpc.py')
| -rwxr-xr-x | src/conf_mode/interfaces_sstpc.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/conf_mode/interfaces_sstpc.py b/src/conf_mode/interfaces_sstpc.py index b588910dc..b9d7a74fb 100755 --- a/src/conf_mode/interfaces_sstpc.py +++ b/src/conf_mode/interfaces_sstpc.py @@ -45,7 +45,7 @@ def get_config(config=None): else: conf = Config() base = ['interfaces', 'sstpc'] - ifname, sstpc = get_interface_dict(conf, base) + ifname, sstpc = get_interface_dict(conf, base, with_pki=True) # We should only terminate the SSTP client session if critical parameters # change. All parameters that can be changed on-the-fly (like interface @@ -57,10 +57,6 @@ def get_config(config=None): # bail out early - no need to further process other nodes break - # Load PKI certificates for later processing - sstpc['pki'] = conf.get_config_dict(['pki'], key_mangling=('-', '_'), - get_first_key=True, - no_tag_node_value_mangle=True) return sstpc def verify(sstpc): |