Add support for jumphosts via ProxyCommand

README.rst

@@ -58,6 +58,10 @@ Connect to an instance by DNS name as user "my-user" and run the command "ls"
 
     $ mssh my-user@ec2-[ec2 IP].us-east-1.compute.amazonaws.com -t [instance id] ls
 
+Connect to an instance via jump host
+
+    $ mssh -J my-user@[jump host id] user@[instance id]
+
 Run sftp against instance using the AWS CLI profile "otherprofile" and transferring my-file
 
     $ msftp -pr otherprofile [instance id]:my-file

doc/source/README.rst

@@ -58,6 +58,10 @@ Connect to an instance by DNS name as user "my-user" and run the command "ls"
 
     $ mssh my-user@ec2-[ec2 IP].us-east-1.compute.amazonaws.com -t [instance id] ls
 
+Connect to an instance via jump host
+
+    $ mssh -J my-user@[jump host id] user@[instance id]
+
 Run sftp against instance using the AWS CLI profile "beta" and transferring my-file
 
     $ msftp -pr beta [instance id]:my-file

ec2instanceconnectcli/EC2InstanceConnectCommand.py

@@ -56,7 +56,9 @@ def get_command(self):
         if len(self.program_command) > 0:
             command = "{0} {1}".format(command, self.program_command)
 
-        if len(self.instance_bundles) > 1:
+        if len(self.instance_bundles) > 1 and self.program == 'ssh':
+            command = "{0} -o \"ProxyCommand=ssh -i {1} -W '[%h]:%p' {2}\"".format(command, self.key_file, self._get_target(self.instance_bundles[1]))
+        elif len(self.instance_bundles) > 1:
             command = "{0} {1}".format(command, self._get_target(self.instance_bundles[1]))
 
         self.logger.debug('Generated command: {0}'.format(command))

ec2instanceconnectcli/input_parser.py

@@ -68,6 +68,16 @@ def parseargs(args, mode='ssh'):
     ]
     # We do this as an array to support future commands that may need multiple instances (eg, scp)
 
+    if args[0].jumphost:
+        instance_bundles.append(
+            {
+                'profile': args[0].profile,
+                'region': args[0].region,
+                'zone': args[0].zone,
+                'target': args[0].jumphost
+            }
+        )
+
     # Process out the command flags & target data
     flags, command, instance_bundles = _parse_command_flags(args[1], instance_bundles, is_ssh=(mode=='ssh'))
 

ec2instanceconnectcli/mops.py

@@ -54,6 +54,7 @@ def main(program, mode):
     parser.add_argument('-z', '--zone', action='store', help='Availability zone', type=str, metavar='')
     parser.add_argument('-u', '--profile', action='store', help='AWS Config Profile', type=str, default=DEFAULT_PROFILE, metavar='')
     parser.add_argument('-t', '--instance_id', action='store', help='EC2 Instance ID. Required if target is hostname', type=str, default=DEFAULT_INSTANCE, metavar='')
+    parser.add_argument('-J', '--jumphost', action='store', help='EC2 Jump host Instance ID.', type=str, default=DEFAULT_INSTANCE, metavar='')
     parser.add_argument('-d', '--debug', action="store_true", help='Turn on debug logging')
 
     args = parser.parse_known_args()

tests/test_EC2ConnectCLI.py

@@ -175,3 +175,36 @@ def test_mscp(self,
         self.assertTrue(mock_instance_data.called)
         self.assertTrue(mock_push_key.called)
         mock_run.assert_called_with(expected_command)
+
+    @mock.patch('ec2instanceconnectcli.EC2InstanceConnectCLI.EC2InstanceConnectCLI.run_command')
+    @mock.patch('ec2instanceconnectcli.key_publisher.push_public_key')
+    @mock.patch('ec2instanceconnectcli.ec2_util.get_instance_data')
+    def test_jumphost(self,
+                   mock_instance_data,
+                   mock_push_key,
+                   mock_run):
+        mock_file = 'identity'
+        flag = ''
+        command = ''
+        logger = EC2InstanceConnectLogger()
+        instance_bundles = [{'username': 'user1', 'instance_id': 'i-afafafafafafafafaf',
+                                     'target': None, 'zone': self.availability_zone, 'region': self.region,
+                                     'profile': self.profile},
+                                    {'username': 'user2', 'instance_id': 'i-acacacacacacacacac',
+                                     'target': None, 'zone': self.availability_zone, 'region': self.region,
+                                     'profile': self.profile}]
+
+        mock_instance_data.return_value = self.instance_info
+        mock_push_key.return_value = None
+        expected_command = "ssh -i {0} {1}@{2} -o \"ProxyCommand=ssh -i {0} -W '[%h]:%p' {3}@{4}\"".format(mock_file,
+                                                                                                          'user1', self.public_ip,
+                                                                                                          'user2', self.public_ip)
+
+        cli_command = EC2InstanceConnectCommand("ssh", instance_bundles, mock_file, flag, command, logger.get_logger())
+        cli = EC2InstanceConnectCLI(instance_bundles, "", cli_command, logger.get_logger())
+        cli.invoke_command()
+
+        # Check that we successfully get to the run
+        self.assertTrue(mock_instance_data.called)
+        self.assertTrue(mock_push_key.called)
+        mock_run.assert_called_with(expected_command)

tests/test_input_parser.py

@@ -22,6 +22,7 @@ class TestInputParser(TestBase):
     parser = argparse.ArgumentParser(description='alternate usage: mssh [user]@[instance-id]:[port]')
     parser.add_argument('-u', '--profile', help='AWS Config Profile', type=str, default='default')
     parser.add_argument('-t', '--instance_id', help='EC2 Instance ID', type=str, default='')
+    parser.add_argument('-J', '--jumphost', action='store', help='EC2 Jump host Instance ID.', type=str, default='')
     parser.add_argument('-r', '--region', action='store', help='AWS region', type=str)
     parser.add_argument('-z', '--zone', action='store', help='Availability zone', type=str)
     parser.add_argument('-U', '--dest_profile', action='store',
@@ -132,3 +133,14 @@ def test_invalid_zone(self):
                                              '-z', 'bad zone', self.dns_name])
 
         self.assertRaises(AssertionError, input_parser.parseargs, args)
+
+    def test_jumphost(self):
+        args = self.parser.parse_known_args(['-J', 'user2@i-ascacacsacacaascas', "user1@{0}".format('i-afafafafafafafafaf')])
+        bundles, flags, command = input_parser.parseargs(args, 'ssh')
+        print(bundles)
+        self.assertEqual(bundles, [
+            {'username': 'user1', 'instance_id': 'i-afafafafafafafafaf',
+            'target': None, 'zone': None, 'region': None, 'profile': 'default'},
+            {'username': 'user2', 'instance_id': 'i-ascacacsacacaascas',
+            'target': None, 'zone': None, 'region': None, 'profile': 'default'}
+        ])