Merge pull request #329 from thomas-mangin/T2226

util: T2226: improvement and fixes

6 files changed, 31 insertions, 15 deletions

diff --git a/src/conf_mode/flow_accounting_conf.py b/src/conf_mode/flow_accounting_conf.py
index eef32687e..54928cdfe 100755
--- a/src/conf_mode/flow_accounting_conf.py
+++ b/src/conf_mode/flow_accounting_conf.py
@@ -83,7 +83,7 @@ def _iptables_get_nflog():
     for iptables_variant in ['iptables', 'ip6tables']:
         # run iptables, save output and split it by lines
         iptables_command = "sudo {0} -t {1} -S {2}".format(iptables_variant, iptables_nflog_table, iptables_nflog_chain)
-        cmd(iptables_command, universal_newlines=True, message='Failed to get flows list')
+        cmd(iptables_command, message='Failed to get flows list')
         iptables_out = stdout.splitlines()
 
         # parse each line and add information to list
diff --git a/src/conf_mode/system-login.py b/src/conf_mode/system-login.py
index 43732cfae..7e854c9c9 100755
--- a/src/conf_mode/system-login.py
+++ b/src/conf_mode/system-login.py
@@ -28,6 +28,8 @@ from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import cmd
 from vyos.util import call
+from vyos.util import DEVNULL
+
 
 radius_config_file = "/etc/pam_radius_auth.conf"
 
@@ -211,6 +213,14 @@ def generate(login):
             os.system("vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_set system login user '{}' authentication plaintext-password '' >/dev/null".format(user['name']))
             os.system("vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_set system login user '{}' authentication encrypted-password '{}' >/dev/null".format(user['name'], user['password_encrypted']))
 
+            # env = os.environ.copy()
+            # env['vyos_libexec_dir'] = '/usr/libexec/vyos'
+
+            # call("/opt/vyatta/sbin/my_set system login user '{}' authentication plaintext-password ''".format(user['name']),
+            #     env=env)
+            # call("/opt/vyatta/sbin/my_set system login user '{}' authentication encrypted-password '{}'".format(user['name'], user['password_encrypted']),
+            #     env=env)
+
     if len(login['radius_server']) > 0:
         # Prepare Jinja2 template loader from files
         tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'system-login')
@@ -256,7 +266,7 @@ def apply(login):
         command += " {}".format(user['name'])
 
         try:
-            call(command)
+            cmd(command)
 
             uid = getpwnam(user['name']).pw_uid
             gid = getpwnam(user['name']).pw_gid
@@ -299,7 +309,7 @@ def apply(login):
                 call('pkill -HUP -u {}'.format(user))
 
             # Remove user account but leave home directory to be safe
-            call('userdel -r {} 2>/dev/null'.format(user))
+            call(f'userdel -r {user}', stderr=DEVNULL)
 
         except Exception as e:
             raise ConfigError('Deleting user "{}" raised an exception: {}'.format(user, e))
@@ -309,8 +319,10 @@ def apply(login):
     #
     if len(login['radius_server']) > 0:
         try:
+            env = os.environ.copy()
+            env['DEBIAN_FRONTEND'] = 'noninteractive'
             # Enable RADIUS in PAM
-            os.system("DEBIAN_FRONTEND=noninteractive pam-auth-update --package --enable radius")
+            cmd("pam-auth-update --package --enable radius", env=env)
 
             # Make NSS system aware of RADIUS, too
             command = "sed -i -e \'/\smapname/b\' \
@@ -321,15 +333,18 @@ def apply(login):
                           -e \'/^group:[^#]*$/s/: */&mapname /\' \
                           /etc/nsswitch.conf"
 
-            call(command)
+            cmd(command)
 
         except Exception as e:
             raise ConfigError('RADIUS configuration failed: {}'.format(e))
 
     else:
         try:
+            env = os.environ.copy()
+            env['DEBIAN_FRONTEND'] = 'noninteractive'
+
             # Disable RADIUS in PAM
-            os.system("DEBIAN_FRONTEND=noninteractive pam-auth-update --package --remove radius")
+            cmd("pam-auth-update --package --remove radius", env=env)
 
             command = "sed -i -e \'/^passwd:.*mapuid[ \t]/s/mapuid[ \t]//\' \
                    -e \'/^passwd:.*[ \t]mapname/s/[ \t]mapname//\' \
@@ -337,10 +352,10 @@ def apply(login):
                    -e \'s/[ \t]*$//\' \
                    /etc/nsswitch.conf"
 
-            call(command)
+            cmd(command)
 
         except Exception as e:
-            raise ConfigError('Removing RADIUS configuration failed'.format(e))
+            raise ConfigError('Removing RADIUS configuration failed.\n{}'.format(e))
 
     return None
 
diff --git a/src/op_mode/flow_accounting_op.py b/src/op_mode/flow_accounting_op.py
index 7f3ad7476..71fdfc288 100755
--- a/src/op_mode/flow_accounting_op.py
+++ b/src/op_mode/flow_accounting_op.py
@@ -76,7 +76,7 @@ def _uacctd_running():
 # get list of interfaces
 def _get_ifaces_dict():
     # run command to get ifaces list
-    out = cmd('/bin/ip link show', universal_newlines=True)
+    out = cmd('/bin/ip link show')
 
     # read output
     ifaces_out = out.splitlines()
@@ -95,7 +95,6 @@ def _get_ifaces_dict():
 def _get_flows_list():
     # run command to get flows list
     out = cmd(f'/usr/bin/pmacct -s -O json -T flows -p {uacctd_pipefile}',
-                universal_newlines=True,
                 message='Failed to get flows list')
 
     # read output
diff --git a/src/op_mode/powerctrl.py b/src/op_mode/powerctrl.py
index 0f3619411..4ab91384b 100755
--- a/src/op_mode/powerctrl.py
+++ b/src/op_mode/powerctrl.py
@@ -24,6 +24,7 @@ from vyos.util import ask_yes_no
 from vyos.util import cmd
 from vyos.util import call
 from vyos.util import run
+from vyos.util import STDOUT
 
 systemd_sched_file = "/run/systemd/shutdown/scheduled"
 
@@ -97,14 +98,14 @@ def execute_shutdown(time, reboot = True, ask=True):
     chk_vyatta_based_reboots()
     ###
 
-    out = cmd(f'/sbin/shutdown {action} now')
+    out = cmd(f'/sbin/shutdown {action} now', stderr=STDOUT)
     print(out.split(",",1)[0])
     return
   elif len(time) == 1:
     # Assume the argument is just time
     ts = parse_time(time[0])
     if ts:
-      cmd(f'/sbin/shutdown {action} {time[0]}')
+      cmd(f'/sbin/shutdown {action} {time[0]}', stderr=STDOUT)
     else:
       sys.exit("Invalid time \"{0}\". The valid format is HH:MM".format(time[0]))
   elif len(time) == 2:
@@ -115,7 +116,7 @@ def execute_shutdown(time, reboot = True, ask=True):
       t = datetime.combine(ds, ts)
       td = t - datetime.now()
       t2 = 1 + int(td.total_seconds())//60 # Get total minutes
-      cmd('/sbin/shutdown {action} {t2}')
+      cmd('/sbin/shutdown {action} {t2}', stderr=STDOUT)
     else:
       if not ts:
         sys.exit("Invalid time \"{0}\". The valid format is HH:MM".format(time[0]))
diff --git a/src/op_mode/version.py b/src/op_mode/version.py
index fe6ecbae5..8599c958f 100755
--- a/src/op_mode/version.py
+++ b/src/op_mode/version.py
@@ -33,6 +33,7 @@ import vyos.limericks
 from vyos.util import cmd
 from vyos.util import call
 from vyos.util import run
+from vyos.util import DEVNULL
 
 
 parser = argparse.ArgumentParser()
@@ -82,7 +83,7 @@ if __name__ == '__main__':
     # Get hypervisor name, if any
     system_type = "bare metal"
     try:
-        hypervisor = cmd('hvinfo 2>/dev/null')
+        hypervisor = cmd('hvinfo',stderr=DEVNULL)
         system_type = "{0} guest".format(hypervisor)
     except OSError:
         # hvinfo returns 1 if it cannot detect any hypervisor
diff --git a/src/system/keepalived-fifo.py b/src/system/keepalived-fifo.py
index 2778deaab..7e2076820 100755
--- a/src/system/keepalived-fifo.py
+++ b/src/system/keepalived-fifo.py
@@ -87,7 +87,7 @@ class KeepalivedFifo:
     def _run_command(self, command):
         logger.debug("Running the command: {}".format(command))
         try:
-            cmd(command, universal_newlines=True)
+            cmd(command)
         except OSError as err:
             logger.error(f'Unable to execute command "{command}": {err}')