From ba0509379c5ca47e4a78fef920d14a52a46b8e82 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 2 Oct 2020 17:42:29 +0200 Subject: acces-ppp: T2953: drop redundant CLI definitions --- interface-definitions/vpn_sstp.xml.in | 240 +++++----------------------------- 1 file changed, 35 insertions(+), 205 deletions(-) (limited to 'interface-definitions/vpn_sstp.xml.in') diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index 5da2f8f24..5433a4ea7 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -13,117 +13,45 @@ Authentication for remote access SSTP Server - - - Local user authentication for SSTP server - + #include + #include + #include + #include + #include + - - - User name for authentication - - - - - Option to disable a SSTP Server user - - - - - - Password for authentication - - - - - Static client IP address - - - - - Upload/Download speed limits - - - - - Upload bandwidth limit in kbits/sec - - - - - - - - Download bandwidth limit in kbits/sec - - - - - - - - - + #include - #include - + + + + + Network settings + + + - Authentication protocol for remote access peer SSTP VPN - - pap chap mschap mschap-v2 - - - pap - Authentication via PAP (Password Authentication Protocol) - - - chap - Authentication via CHAP (Challenge Handshake Authentication Protocol) - - - mschap - Authentication via MS-CHAP (Microsoft Challenge Handshake Authentication Protocol) - - - mschap-v2 - Authentication via MS-CHAPv2 (Microsoft Challenge Handshake Authentication Protocol, version 2) - - - (pap|chap|mschap|mschap-v2) - - + Client IP pools and gateway setting - - #include - #include - - - - Upload/Download speed limits - - - - - Specifies RADIUS attribute containing rate information (default 'Filter-Id') - - - - - Specifies vendor dictionary (needs to be in /usr/share/accel-ppp/radius) - - - - - Enable RADIUS bandwidth shaping - - - - - + #include + #include + #include + #include + #include + + + + + PPP (Point-to-Point Protocol) settings + + + #include + #include + #include @@ -168,106 +96,8 @@ - - - Network settings - - - - - Client IP pools and gateway setting - - - - - Client IP subnet (CIDR notation) - - ipv4net - IPv4 address and prefix length - - - - - Not a valid CIDR formatted prefix - - - - - - Gateway IP address - - - - invalid IPv4 address - - ipv4 - Default Gateway send to the client - - - - - - #include - #include - #include - - - - - PPP (Point-to-Point Protocol) settings - - - - - Specifies mppe negotiation preferences - - require prefer deny - - - (^require|prefer|deny) - - - require - send mppe request, if client rejects, drop the connection - - - prefer - send mppe request, if client rejects continue - - - deny - drop all mppe - - - - - - LCP echo-requests/sec - - - - - - - - Maximum number of Echo-Requests may be sent without valid reply - - - - - - - - Timeout in seconds to wait for any peer activity. If this option specified it turns on adaptive lcp echo functionality and "lcp-echo-failure" is not used. - - - - - - - - - - - + + + + -- cgit v1.2.3 From cbdbbdceaad5fc02ca673bed199f666137a2ce73 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 2 Oct 2020 17:51:44 +0200 Subject: sstp: T2953: migrate ppp-settings to ppp-options node --- interface-definitions/vpn_sstp.xml.in | 2 +- src/conf_mode/vpn_sstp.py | 4 +-- src/migration-scripts/sstp/2-to-3 | 47 +++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100755 src/migration-scripts/sstp/2-to-3 (limited to 'interface-definitions/vpn_sstp.xml.in') diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index 5433a4ea7..d5e23fe40 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -44,7 +44,7 @@ #include - + PPP (Point-to-Point Protocol) settings diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index 7fc370f99..5d928a945 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -273,9 +273,9 @@ def get_config(config=None): # # read in PPP stuff - conf.set_level(base_path + ['ppp-settings']) + conf.set_level(base_path + ['ppp-options']) if conf.exists('mppe'): - sstp['ppp_mppe'] = conf.return_value(['ppp-settings', 'mppe']) + sstp['ppp_mppe'] = conf.return_value(['mppe']) if conf.exists(['lcp-echo-failure']): sstp['ppp_echo_failure'] = conf.return_value(['lcp-echo-failure']) diff --git a/src/migration-scripts/sstp/2-to-3 b/src/migration-scripts/sstp/2-to-3 new file mode 100755 index 000000000..51f4effed --- /dev/null +++ b/src/migration-scripts/sstp/2-to-3 @@ -0,0 +1,47 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2020 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 +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# - Rename SSTP ppp-settings node to ppp-options to make use of a common +# Jinja Template to render Accel-PPP services + +from vyos.configtree import ConfigTree +from sys import argv +from sys import exit + +if (len(argv) < 1): + print("Must specify file name!") + exit(1) + +file_name = argv[1] + +with open(file_name, 'r') as f: + config_file = f.read() + +config = ConfigTree(config_file) +base_path = ['vpn', 'sstp'] +if not config.exists(base_path): + # Nothing to do + exit(0) +else: + if config.exists(base_path + ['ppp-settings']): + config.rename(base_path + ['ppp-settings'], 'ppp-options') + + try: + with open(file_name, 'w') as f: + f.write(config.to_string()) + except OSError as e: + print("Failed to save the modified config: {}".format(e)) + exit(1) -- cgit v1.2.3