Update SSH connector to properly quote filenames.

Author: Fizzadar

pyinfra/api/connectors/ssh.py

@@ -26,6 +26,7 @@
 import pyinfra
 
 from pyinfra import logger
+from pyinfra.api.command import QuoteString, StringCommand
 from pyinfra.api.exceptions import ConnectError, PyinfraError
 from pyinfra.api.util import get_file_io, memoize
 
@@ -420,15 +421,15 @@ def put_file(
         _put_file(host, filename_or_io, temp_file)
 
         # Execute run_shell_command w/sudo and/or su_user
-        command = 'mv {0} {1}'.format(temp_file, remote_filename)
+        command = StringCommand('mv', temp_file, QuoteString(remote_filename))
 
         # Move it to the su_user if present
         if su_user:
-            command = '{0} && chown {1} {2}'.format(command, su_user, remote_filename)
+            command = StringCommand(command, '&&', 'chown', su_user, QuoteString(remote_filename))
 
         # Otherwise any sudo_user
         elif sudo_user:
-            command = '{0} && chown {1} {2}'.format(command, sudo_user, remote_filename)
+            command = StringCommand(command, '&&', 'chown', sudo_user, QuoteString(remote_filename))
 
         status, _, stderr = run_shell_command(
             state, host, command,

tests/test_connectors/test_ssh.py

@@ -498,7 +498,7 @@ def test_put_file_sudo(self, fake_sftp_client, fake_ssh_client):
         fake_open = mock_open(read_data='test!')
         with patch('pyinfra.api.util.open', fake_open, create=True):
             status = host.put_file(
-                'not-a-file', 'not-another-file',
+                'not-a-file', 'not another file',
                 print_output=True,
                 sudo=True,
                 sudo_user='ubuntu',
@@ -508,12 +508,13 @@ def test_put_file_sudo(self, fake_sftp_client, fake_ssh_client):
 
         fake_ssh_client().exec_command.assert_called_with((
             "sudo -H -n -u ubuntu sh -c 'mv "
-            '/tmp/pyinfra-43db9984686317089fefcf2e38de527e4cb44487 '
-            "not-another-file && chown ubuntu not-another-file'"
+            '/tmp/pyinfra-de01e82cb691e8a31369da3c7c8f17341c44ac24 '
+            "\'\"\'\"\'not another file\'\"\'\"\' && chown ubuntu "
+            "\'\"\'\"\'not another file\'\"\'\"\'\'"
         ), get_pty=False)
 
         fake_sftp_client.from_transport().putfo.assert_called_with(
-            fake_open(), '/tmp/pyinfra-43db9984686317089fefcf2e38de527e4cb44487',
+            fake_open(), '/tmp/pyinfra-de01e82cb691e8a31369da3c7c8f17341c44ac24',
         )
 
     @patch('pyinfra.api.connectors.ssh.SSHClient')