Skip to content

Allow using Environment creds on AWS #26

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

Open
GnatorX wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow using Environment creds on AWS #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions cuckoo/machinery/aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,13 @@ def _initialize_check(self):
self.dynamic_machines_sequence = 0
self.dynamic_machines_count = 0
log.info("connecting to AWS:{}".format(self.options.aws.region_name))
self.ec2_resource = boto3.resource(
"ec2", region_name=self.options.aws.region_name, aws_access_key_id=self.options.aws.aws_access_key_id,
aws_secret_access_key=self.options.aws.aws_secret_access_key)

if not self.options.aws.aws_access_key_id or not self.options.aws.aws_secret_access_key:
self.ec2_resource = boto3.resource("ec2", region_name=self.options.aws.region_name)
else:
self.ec2_resource = boto3.resource(
"ec2", region_name=self.options.aws.region_name, aws_access_key_id=self.options.aws.aws_access_key_id,
aws_secret_access_key=self.options.aws.aws_secret_access_key)

# Iterate over all instances with tag that has a key of AUTOSCALE_CUCKOO
for instance in self.ec2_resource.instances.filter(Filters=[{"Name": "instance-state-name",
Expand Down
1 change: 1 addition & 0 deletions cuckoo/private/cwd/conf/aws.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ availability_zone = {{ aws.aws.availability_zone }}
# Access keys consist of two parts: an access key ID (for example, AKIAIOSFODNN7EXAMPLE)
# and a secret access key (for example, wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY).
# To create access keys for your AWS account root user, you must use the AWS Management Console.
# Leaving these empty will default to picking up credential information from environment or EC2 metadata
aws_access_key_id = {{ aws.aws.aws_access_key_id }}
aws_secret_access_key = {{ aws.aws.aws_secret_access_key }}

Expand Down