Properly handle quotes in argument masking

Use shlex to parse the command line, thus handling quotes and other
special characters.

Change-Id: Icc3a2cd934aac8f67e07d967f76c7679bcb34996
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
(cherry picked from commit bddbf2a740b46d1ad763967b8c8662b1877a4d75)

diff --git a/deploy/common.py b/deploy/common.py
index 3530458..80832e2 100644 (file)
--- a/deploy/common.py
+++ b/deploy/common.py
@@ -18,6 +18,7 @@ import shutil
 import stat
 import errno
 import time
+import shlex
 
 N = {'id': 0, 'status': 1, 'name': 2, 'cluster': 3, 'ip': 4, 'mac': 5,
      'roles': 6, 'pending_roles': 7, 'online': 8, 'group_id': 9}
@@ -41,7 +42,7 @@ os.chmod(LOGFILE, 0664)
 
 
 def mask_arguments(cmd, mask_args, mask_str):
-    cmd_line = cmd.split()
+    cmd_line = shlex.split(cmd)
     for pos in mask_args:
         # Don't mask the actual command; also check if we don't reference
         # beyond bounds