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/vpn_sstp.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/vpn_sstp.py')
| -rwxr-xr-x | src/conf_mode/vpn_sstp.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index ac053cc76..6bf9307e1 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2023 VyOS maintainers and contributors +# Copyright (C) 2018-2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -54,14 +54,11 @@ def get_config(config=None): return None # retrieve common dictionary keys - sstp = get_accel_dict(conf, base, sstp_chap_secrets) + sstp = get_accel_dict(conf, base, sstp_chap_secrets, with_pki=True) if dict_search('client_ip_pool', sstp): # Multiple named pools require ordered values T5099 sstp['ordered_named_pools'] = get_pools_in_order(dict_search('client_ip_pool', sstp)) - if sstp: - sstp['pki'] = conf.get_config_dict(['pki'], key_mangling=('-', '_'), - get_first_key=True, - no_tag_node_value_mangle=True) + sstp['server_type'] = 'sstp' return sstp |