Merge pull request #329 from thomas-mangin/T2226

util: T2226: improvement and fixes

1 files changed, 8 insertions, 7 deletions

diff --git a/python/vyos/remote.py b/python/vyos/remote.py
index f918461d1..1b4d3876e 100644
--- a/python/vyos/remote.py
+++ b/python/vyos/remote.py
@@ -18,7 +18,8 @@ import os
 import re
 import fileinput
 
-from vyos.util import cmd, DEVNULL
+from vyos.util import cmd
+from vyos.util import DEVNULL
 
 
 def check_and_add_host_key(host_name):
@@ -31,10 +32,10 @@ def check_and_add_host_key(host_name):
         mode = 0o600
         os.mknod(known_hosts, 0o600)
 
-    keyscan_cmd = 'ssh-keyscan -t rsa {} 2>/dev/null'.format(host_name)
+    keyscan_cmd = 'ssh-keyscan -t rsa {}'.format(host_name)
 
     try:
-        host_key = cmd(keyscan_cmd, shell=True, stderr=DEVNULL)
+        host_key = cmd(keyscan_cmd, stderr=DEVNULL)
     except OSError:
         sys.exit("Can not get RSA host key")
 
@@ -61,9 +62,9 @@ def check_and_add_host_key(host_name):
         print("Host key has changed!")
         print("If you trust the host key fingerprint below, continue.")
 
-    fingerprint_cmd = 'ssh-keygen -lf /dev/stdin <<< "{}"'.format(host_key)
+    fingerprint_cmd = 'ssh-keygen -lf /dev/stdin'
     try:
-        fingerprint = cmd(fingerprint_cmd, shell=True, stderr=DEVNULL)
+        fingerprint = cmd(fingerprint_cmd, stderr=DEVNULL, input=host_key)
     except OSError:
         sys.exit("Can not get RSA host key fingerprint.")
 
@@ -125,7 +126,7 @@ def get_remote_config(remote_file):
         # Try header first, and look for 'OK' or 'Moved' codes:
         curl_cmd = 'curl {0} -q -I {1}'.format(redirect_opt, remote_file)
         try:
-            curl_output = cmd(curl_cmd, shell=True)
+            curl_output = cmd(curl_cmd)
         except OSError:
             sys.exit(1)
 
@@ -142,6 +143,6 @@ def get_remote_config(remote_file):
         curl_cmd = 'curl {0} -# {1}'.format(redirect_opt, remote_file)
 
     try:
-        return cmd(curl_cmd, shell=True, stderr=None)
+        return cmd(curl_cmd, stderr=None)
     except OSError:
         return None