From 52e868e1abfecf00aafc359adefcd3ca7c57b8bd Mon Sep 17 00:00:00 2001
From: aapostoliuk <a.apostoliuk@vyos.io>
Date: Wed, 24 Jan 2024 15:50:01 +0200
Subject: T5971: Rewritten ppp options in accel-ppp services

Rewritten 'ppp-options' to the same view in all accel-ppp services.
Adding IPv6 support to PPTP.

(cherry picked from commit d9e57fe65dd538c6ea80637f4f6f23cf11dc583d)
---
 src/conf_mode/vpn_l2tp.py |  5 -----
 src/conf_mode/vpn_pptp.py | 30 +++---------------------------
 src/conf_mode/vpn_sstp.py |  1 -
 3 files changed, 3 insertions(+), 33 deletions(-)

(limited to 'src/conf_mode')

diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index b569ca140..36b3d2a30 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -51,11 +51,6 @@ def get_config(config=None):
         # Multiple named pools require ordered values T5099
         l2tp['ordered_named_pools'] = get_pools_in_order(
             dict_search('client_ip_pool', l2tp))
-    l2tp['ip6_column'] = []
-    if dict_search('client_ipv6_pool.prefix', l2tp):
-        l2tp['ip6_column'].append('ipv6')
-    if dict_search('client_ipv6_pool.delegate', l2tp):
-        l2tp['ip6_column'].append('ip6-db')
     l2tp['server_type'] = 'l2tp'
     return l2tp
 
diff --git a/src/conf_mode/vpn_pptp.py b/src/conf_mode/vpn_pptp.py
index 0629625bf..b1d5067d5 100755
--- a/src/conf_mode/vpn_pptp.py
+++ b/src/conf_mode/vpn_pptp.py
@@ -22,6 +22,7 @@ from vyos.config import Config
 from vyos.template import render
 from vyos.utils.process import call
 from vyos.utils.dict import dict_search
+from vyos.accel_ppp_util import verify_accel_ppp_base_service
 from vyos.accel_ppp_util import verify_accel_ppp_ip_pool
 from vyos.accel_ppp_util import get_pools_in_order
 from vyos import ConfigError
@@ -58,36 +59,10 @@ def get_config(config=None):
 def verify(pptp):
     if not pptp:
         return None
-    auth_mode = dict_search('authentication.mode', pptp)
-    if auth_mode == 'local':
-        if not dict_search('authentication.local_users', pptp):
-            raise ConfigError(
-                'PPTP local auth mode requires local users to be configured!')
-
-        for user in dict_search('authentication.local_users.username', pptp):
-            user_config = pptp['authentication']['local_users']['username'][
-                user]
-            if 'password' not in user_config:
-                raise ConfigError(f'Password required for local user "{user}"')
-
-    elif auth_mode == 'radius':
-        if not dict_search('authentication.radius.server', pptp):
-            raise ConfigError(
-                'RADIUS authentication requires at least one server')
-        for server in dict_search('authentication.radius.server', pptp):
-            radius_config = pptp['authentication']['radius']['server'][server]
-            if 'key' not in radius_config:
-                raise ConfigError(
-                    f'Missing RADIUS secret key for server "{server}"')
 
+    verify_accel_ppp_base_service(pptp)
     verify_accel_ppp_ip_pool(pptp)
 
-    if 'name_server' in pptp:
-        if len(pptp['name_server']) > 2:
-            raise ConfigError(
-                'Not more then two IPv4 DNS name-servers can be configured'
-            )
-
     if 'wins_server' in pptp and len(pptp['wins_server']) > 2:
         raise ConfigError(
             'Not more then two WINS name-servers can be configured')
@@ -105,6 +80,7 @@ def generate(pptp):
 
     return None
 
+
 def apply(pptp):
     if not pptp:
         call('systemctl stop accel-ppp@pptp.service')
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index a84513a0f..5c229fe62 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -20,7 +20,6 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.configdict import get_accel_dict
-from vyos.configdict import dict_merge
 from vyos.pki import wrap_certificate
 from vyos.pki import wrap_private_key
 from vyos.template import render
-- 
cgit v1.2.3