Fix shell quoting for ssh remote command lines

Found by Richard Maw.

2 files changed, 11 insertions, 6 deletions

diff --git a/kvm.write b/kvm.write
index 3e3b3eb1..16f188b5 100755
--- a/kvm.write
+++ b/kvm.write
@@ -94,11 +94,13 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         xfer_hole_path = morphlib.util.get_data_path('xfer-hole')
         recv_hole = morphlib.util.get_data('recv-hole')
 
+        ssh_remote_cmd = [
+            'sh', '-c', recv_hole, 'dummy-argv0', 'file', vm_path
+            ]
+
         cliapp.runcmd(
             ['python', xfer_hole_path, raw_disk],
-            ['ssh', ssh_host,
-             'sh', '-c', cliapp.shell_quote(recv_hole),
-             'dummy-argv0', 'file', vm_path],
+            ['ssh', ssh_host] + map(cliapp.shell_quote, ssh_remote_cmd),
             stdout=None, stderr=None)
 
     def create_libvirt_guest(self, ssh_host, vm_name, vm_path, autostart):
diff --git a/virtualbox-ssh.write b/virtualbox-ssh.write
index 1aebe490..39ea8f86 100755
--- a/virtualbox-ssh.write
+++ b/virtualbox-ssh.write
@@ -107,11 +107,14 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         xfer_hole_path = morphlib.util.get_data_path('xfer-hole')
         recv_hole = morphlib.util.get_data('recv-hole')
 
+        ssh_remote_cmd = [
+            'sh', '-c', recv_hole,
+            'dummy-argv0', 'vbox', vdi_path, str(st.st_size),
+        ]
+
         cliapp.runcmd(
             ['python', xfer_hole_path, raw_disk],
-            ['ssh', ssh_host,
-             'sh', '-c', cliapp.shell_quote(recv_hole),
-             'dummy-argv0', 'vbox', vdi_path, str(st.st_size)],
+            ['ssh', ssh_host] + map(cliapp.shell_quote, ssh_remote_cmd),
             stdout=None, stderr=None)
 
     def virtualbox_version(self, ssh_host):