1 files changed, 11 insertions, 14 deletions
diff --git a/src/op_mode/wireguard.py b/src/op_mode/wireguard.py
index 38c061cf4..1b90f4fa7 100755
--- a/src/op_mode/wireguard.py
+++ b/src/op_mode/wireguard.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-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
@@ -13,14 +13,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
 
 import argparse
 import os
 import sys
 import shutil
-import subprocess
 import syslog as sl
 import re
 
@@ -28,6 +25,7 @@ from vyos.ifconfig import WireGuardIf
 
 from vyos import ConfigError
 from vyos.config import Config
+from vyos.util import cmd, run
 
 dir = r'/config/auth/wireguard'
 psk = dir + '/preshared.key'
@@ -36,16 +34,14 @@ def check_kmod():
     """ check if kmod is loaded, if not load it """
     if not os.path.exists('/sys/module/wireguard'):
         sl.syslog(sl.LOG_NOTICE, "loading wirguard kmod")
-        if os.system('sudo modprobe wireguard') != 0:
+        if run('sudo modprobe wireguard') != 0:
             sl.syslog(sl.LOG_ERR, "modprobe wireguard failed")
             raise ConfigError("modprobe wireguard failed")
 
 def generate_keypair(pk, pub):
     """ generates a keypair which is stored in /config/auth/wireguard """
     old_umask = os.umask(0o027)
-    ret = subprocess.call(
-        ['wg genkey | tee ' + pk + '|wg pubkey > ' + pub], shell=True)
-    if ret != 0:
+    if run(f'wg genkey | tee {pk} | wg pubkey > {pub}') != 0:
         raise ConfigError("wireguard key-pair generation failed")
     else:
         sl.syslog(
@@ -69,9 +65,9 @@ def genkey(location):
     else:
         """ if keypair is bing executed from a running iso """
         if not os.path.exists(location):
-            subprocess.call(['sudo mkdir -p ' + location], shell=True)
-            subprocess.call(['sudo chgrp vyattacfg ' + location], shell=True)
-            subprocess.call(['sudo chmod 750 ' + location], shell=True)
+            run(f'sudo mkdir -p {location}')
+            run(f'sudo chgrp vyattacfg {location}')
+            run(f'sudo chmod 750 {location}')
         generate_keypair(pk, pub)
     os.umask(old_umask)
 
@@ -90,10 +86,11 @@ def genpsk():
         it's stored only in the cli config
     """
 
-    subprocess.call(['wg genpsk'], shell=True)
+    psk = cmd('wg genpsk')
+    print(psk)
 
 def list_key_dirs():
-    """ lists all dirs under /config/auth/wireguard """ 
+    """ lists all dirs under /config/auth/wireguard """
     if os.path.exists(dir):
         nks = next(os.walk(dir))[1]
         for nk in nks:
@@ -150,7 +147,7 @@ if __name__ == '__main__':
         if args.listkdir:
             list_key_dirs()
         if args.showinterface:
-            intf = WireGuardIf(args.showinterface)
+            intf = WireGuardIf(args.showinterface, create=False, debug=False)
             intf.op_show_interface()
         if args.delkdir:
             if args.location: