From b476fdac3ad96d4e24d723bcdc5d2ad38c8ac261 Mon Sep 17 00:00:00 2001 From: Urjit Singh Bhatia Date: Thu, 30 Nov 2017 14:15:23 -0800 Subject: [PATCH] Support internal/ext ip addresses if you don't have dns forwarding setup - Also honours the local ssh config - Updated boto version --- beeswithmachineguns/bees.py | 16 +++++++++++++--- requirements.txt | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/beeswithmachineguns/bees.py b/beeswithmachineguns/bees.py index 41916eb..5d039b1 100644 --- a/beeswithmachineguns/bees.py +++ b/beeswithmachineguns/bees.py @@ -398,18 +398,27 @@ def _attack(params): print('Bee %i is joining the swarm.' % params['i']) try: + # Support using local ssh config + config = paramiko.SSHConfig() + home = os.path.expanduser("~") + config.parse(open(home + '/.ssh/config')) + + target = config.lookup(params['instance_name']) + client = paramiko.SSHClient() + # Load host keys + client.load_system_host_keys() client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) pem_path = params.get('key_name') and _get_pem_path(params['key_name']) or None if not os.path.isfile(pem_path): client.load_system_host_keys() - client.connect(params['instance_name'], username=params['username']) + client.connect(params['instance_ip'], username=params['username']) else: client.connect( - params['instance_name'], + params['instance_ip'], username=params['username'], - key_filename=pem_path) + key_filename=target['identityfile']) print('Bee %i is firing her machine gun. Bang bang!' % params['i']) @@ -754,6 +763,7 @@ def attack(url, n, c, **options): params.append({ 'i': i, 'instance_id': instance.id, + 'instance_ip': instance.private_ip_address if len(instance.ip_address) == 0 else instance.ip_address, 'instance_name': instance.private_dns_name if instance.public_dns_name == "" else instance.public_dns_name, 'url': urls[i % url_count], 'concurrent_requests': connections_per_instance, diff --git a/requirements.txt b/requirements.txt index a59b519..7190e6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -boto==2.38.0 +boto==2.48.0 paramiko==1.15.2 future