From c51b8f3e2fe1a8425fba2d3eb9c07049ef9b22bb Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Sun, 5 Apr 2020 16:56:41 +0100
Subject: util: T2226: rewrite conf accel-ppp commands to use cmd

---
 src/conf_mode/vpn_sstp.py | 51 ++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 29 deletions(-)

(limited to 'src/conf_mode/vpn_sstp.py')

diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index 66b1822df..d4fd0f4a3 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -18,16 +18,16 @@ import os
 
 from time import sleep
 from sys import exit
-from subprocess import check_output
 from socket import socket, AF_INET, SOCK_STREAM
 from copy import deepcopy
 from stat import S_IRUSR, S_IWUSR, S_IRGRP
 from jinja2 import FileSystemLoader, Environment
 
 from vyos.config import Config
+from vyos import ConfigError
 from vyos.defaults import directories as vyos_data_dir
 from vyos.util import process_running, subprocess_cmd
-from vyos import ConfigError
+from vyos.util import process_running, cmd, run
 
 pidfile = r'/var/run/accel_sstp.pid'
 sstp_cnf_dir = r'/etc/accel-ppp/sstp'
@@ -53,16 +53,9 @@ def chk_con():
                 raise("failed to start sstp server")
                 break
 
-def accel_cmd(cmd):
-    if not cmd:
-        return None
-
-    try:
-        ret = check_output(['/usr/bin/accel-cmd', '-p', '2005', cmd])
-        return ret.decode().strip()
 
-    except:
-        return 1
+def _accel_cmd(command):
+    return run(f'/usr/bin/accel-cmd -p 2005 {command}')
 
 default_config_data = {
     'local_users' : [],
@@ -363,12 +356,12 @@ def generate(sstp):
 def apply(sstp):
     if sstp is None:
         if process_running(pidfile):
-            cmd = 'start-stop-daemon'
-            cmd += ' --stop '
-            cmd += ' --quiet'
-            cmd += ' --oknodo'
-            cmd += ' --pidfile ' + pidfile
-            subprocess_cmd(cmd)
+            command = 'start-stop-daemon'
+            command += ' --stop '
+            command += ' --quiet'
+            command += ' --oknodo'
+            command += ' --pidfile ' + pidfile
+            cmd(command)
 
         if os.path.exists(pidfile):
             os.remove(pidfile)
@@ -379,23 +372,23 @@ def apply(sstp):
         if os.path.exists(pidfile):
             os.remove(pidfile)
 
-        cmd = 'start-stop-daemon'
-        cmd += ' --start '
-        cmd += ' --quiet'
-        cmd += ' --oknodo'
-        cmd += ' --pidfile ' + pidfile
-        cmd += ' --exec /usr/sbin/accel-pppd'
+        command = 'start-stop-daemon'
+        command += ' --start '
+        command += ' --quiet'
+        command += ' --oknodo'
+        command += ' --pidfile ' + pidfile
+        command += ' --exec /usr/sbin/accel-pppd'
         # now pass arguments to accel-pppd binary
-        cmd += ' --'
-        cmd += ' -c ' + sstp_conf
-        cmd += ' -p ' + pidfile
-        cmd += ' -d'
-        subprocess_cmd(cmd)
+        command += ' --'
+        command += ' -c ' + sstp_conf
+        command += ' -p ' + pidfile
+        command += ' -d'
+        cmd(command)
 
         chk_con()
 
     else:
-        accel_cmd('restart')
+        _accel_cmd('restart')
 
 
 if __name__ == '__main__':
-- 
cgit v1.2.3


From 7256810914e6664bf92041dcd7c3daf649ce0001 Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Sun, 5 Apr 2020 23:08:09 +0100
Subject: util: T2226: remove all references to subprocess_cmd

---
 python/vyos/util.py            | 8 --------
 src/conf_mode/system-syslog.py | 1 -
 src/conf_mode/vpn_sstp.py      | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/conf_mode/vpn_sstp.py')

diff --git a/python/vyos/util.py b/python/vyos/util.py
index e0030d1bd..fa2b4dd99 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -89,14 +89,6 @@ def cmd(command, section='', shell=None, input=None, timeout=None, env=None, uni
     return decoded
 
 
-# This is now deprecated
-def subprocess_cmd(command):
-    """ execute arbitrary command via Popen """
-    from subprocess import Popen, PIPE
-    p = Popen(command, stdout=PIPE, shell=True)
-    p.communicate()
-
-
 # file manipulation
 
 
diff --git a/src/conf_mode/system-syslog.py b/src/conf_mode/system-syslog.py
index 915a631ec..25b9b5bed 100755
--- a/src/conf_mode/system-syslog.py
+++ b/src/conf_mode/system-syslog.py
@@ -22,7 +22,6 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.defaults import directories as vyos_data_dir
-from vyos.util import subprocess_cmd
 from vyos import ConfigError
 from vyos.util import run
 
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index d4fd0f4a3..ca0844c50 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -26,7 +26,7 @@ from jinja2 import FileSystemLoader, Environment
 from vyos.config import Config
 from vyos import ConfigError
 from vyos.defaults import directories as vyos_data_dir
-from vyos.util import process_running, subprocess_cmd
+from vyos.util import process_running
 from vyos.util import process_running, cmd, run
 
 pidfile = r'/var/run/accel_sstp.pid'
-- 
cgit v1.2.3