Skip to content

Wrap command in shlex.quote() #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crestonbunch wants to merge 2 commits into from
Closed

Wrap command in shlex.quote() #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c94dfb
Wrap command in shlex.quote()
crestonbunch Jun 11, 2021
473dbcc
Update tests
crestonbunch Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ec2instanceconnectcli/EC2InstanceConnectCommand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
import shlex

class EC2InstanceConnectCommand(object):
"""
Expand Down Expand Up @@ -54,7 +55,7 @@ def get_command(self):

#program specific command
if len(self.program_command) > 0:
command = "{0} {1}".format(command, self.program_command)
command = "{0} {1}".format(command, shlex.quote(self.program_command))

if len(self.instance_bundles) > 1:
command = "{0} {1}".format(command, self._get_target(self.instance_bundles[1]))
Expand Down
10 changes: 5 additions & 5 deletions tests/test_EC2ConnectCLI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def test_mssh_no_target(self,
cli = EC2InstanceConnectCLI(instance_bundles, "", cli_command, logger.get_logger())
cli.invoke_command()

expected_command = 'ssh -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3} {4}'.format(mock_file, flag, self.default_user,
expected_command = 'ssh -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3} \'{4}\''.format(mock_file, flag, self.default_user,
self.public_ip, command)

# Check that we successfully get to the run
Expand Down Expand Up @@ -76,7 +76,7 @@ def test_mssh_no_target_no_public_ip(self,
cli = EC2InstanceConnectCLI(instance_bundles, "", cli_command, logger.get_logger())
cli.invoke_command()

expected_command = 'ssh -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3} {4}'.format(mock_file, flag, self.default_user,
expected_command = 'ssh -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3} \'{4}\''.format(mock_file, flag, self.default_user,
self.private_ip, command)

# Check that we successfully get to the run
Expand Down Expand Up @@ -107,7 +107,7 @@ def test_mssh_with_target(self,
cli = EC2InstanceConnectCLI(instance_bundles, "", cli_command, logger.get_logger())
cli.invoke_command()

expected_command = 'ssh -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3} {4}'.format(mock_file, flag, self.default_user,
expected_command = 'ssh -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3} \'{4}\''.format(mock_file, flag, self.default_user,
host, command)
# Check that we successfully get to the run
# Since both target and availability_zone are provided, mock_instance_data should not be called
Expand All @@ -133,7 +133,7 @@ def test_msftp(self,
mock_instance_data.return_value = self.instance_info
mock_push_key.return_value = None

expected_command = 'sftp -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3}:{4} {5}'.format(mock_file, flag, self.default_user,
expected_command = 'sftp -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3}:{4} \'{5}\''.format(mock_file, flag, self.default_user,
self.public_ip, 'file1', command)

cli_command = EC2InstanceConnectCommand("sftp", instance_bundles, mock_file, flag, command, logger.get_logger())
Expand Down Expand Up @@ -166,7 +166,7 @@ def test_mscp(self,
mock_instance_data.return_value = self.instance_info
mock_push_key.return_value = None

expected_command = 'scp -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3}:{4} {5} {6}@{7}:{8}'.format(mock_file, flag, self.default_user,
expected_command = 'scp -o "IdentitiesOnly=yes" -i {0} {1} {2}@{3}:{4} \'{5}\' {6}@{7}:{8}'.format(mock_file, flag, self.default_user,
self.public_ip, 'file1', command,
self.default_user,
self.public_ip, 'file4')
Expand Down