Merge pull request #21 from carnal0wnage/print_fix

Print fix
This commit is contained in:
Ken Johnson
2018-04-06 13:05:49 -10:00
committed by GitHub
17 changed files with 101 additions and 113 deletions

View File

@@ -10,7 +10,6 @@ import datetime #change as required once we decide time format
from libs.sql import *
# we chould probably load this from one place in the future #TODO
db_name = "weirdAAL.db"

View File

@@ -32,7 +32,7 @@ def describe_configuration_recorders(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, r
print('[-] {} : does not have config access. Did you check first?' .format(AWS_ACCESS_KEY_ID))
pass
else:
print "Unexpected error: {}" .format(e)
print("Unexpected error: {}" .format(e))
except KeyboardInterrupt:
print("CTRL-C received, exiting...")
@@ -57,7 +57,7 @@ def describe_configuration_rules(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, regio
print('[-] {} : does not have config access. Did you check first?' .format(AWS_ACCESS_KEY_ID))
pass
else:
print "Unexpected error: {}" .format(e)
print("Unexpected error: {}" .format(e))
except KeyboardInterrupt:
print("CTRL-C received, exiting...")

View File

@@ -17,15 +17,14 @@ def list_pipelines(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
try:
for region in regions:
client = boto3.client('datapipeline', aws_access_key_id=AWS_ACCESS_KEY_ID, aws_secret_access_key=AWS_SECRET_ACCESS_KEY, region_name=region)
response = client.list_pipelines()
print"### {} Data Pipelines ###" .format(region)
print("### {} Data Pipelines ###" .format(region))
if response.get('pipelineIdList') is None:
print("{} likely does not have Data Pipeline permissions\n" .format(AWS_ACCESS_KEY_ID))
elif len(response['pipelineIdList']) <= 0:
print("[-] ListPipelines allowed for {} but no results [-]" .format(region))
else:
print"### {} Data Pipelines ###" .format(region)
print("### {} Data Pipelines ###" .format(region))
for pipes in response['pipelineIdList']:
pp.pprint(pipes)
print("\n")

View File

@@ -17,14 +17,13 @@ def list_dynamodb_tables(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
try:
for region in regions:
client = boto3.client('dynamodb', aws_access_key_id=AWS_ACCESS_KEY_ID, aws_secret_access_key=AWS_SECRET_ACCESS_KEY, region_name=region)
response = client.list_tables()
if response.get('TableNames') is None:
print("{} likely does not have DynamoDB permissions\n" .format(AWS_ACCESS_KEY_ID))
elif len(response['TableNames']) <= 0:
print("[-] ListTables allowed for {} but no results [-]" .format(region))
else:
print"### {} DynamoDB Tables ###" .format(region)
print("### {} DynamoDB Tables ###" .format(region))
for tables in response['TableNames']:
pp.pprint(tables)
print("\n")
@@ -44,16 +43,14 @@ def list_dynamodb_tables_detailed(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
try:
for region in regions:
client = boto3.client('dynamodb', aws_access_key_id=AWS_ACCESS_KEY_ID, aws_secret_access_key=AWS_SECRET_ACCESS_KEY, region_name=region)
response = client.list_tables()
if response.get('TableNames') is None:
print("{} likely does not have DynamoDB permissions\n" .format(AWS_ACCESS_KEY_ID))
elif len(response['TableNames']) <= 0:
print("[-] ListTables allowed for {} but no results [-]" .format(region))
else:
print"### {} DynamoDB Tables ###" .format(region)
print("### {} DynamoDB Tables ###" .format(region))
for tables in response['TableNames']:
#pp.pprint(tables)
describe_table(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, tables, region)
print("\n")
@@ -71,7 +68,6 @@ def describe_table(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, table, region):
print("### Describing DynamoDB Table: {} ###" .format(table))
try:
client = boto3.client('dynamodb', aws_access_key_id=AWS_ACCESS_KEY_ID, aws_secret_access_key=AWS_SECRET_ACCESS_KEY, region_name=region)
response = client.describe_table(TableName=table)
if response.get('Table') is None:
print("{} likely does not have DynamoDB permissions\n" .format(AWS_ACCESS_KEY_ID))

View File

@@ -18,14 +18,12 @@ def list_dynamodbstreams(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
try:
for region in regions:
client = boto3.client('dynamodbstreams', aws_access_key_id=AWS_ACCESS_KEY_ID, aws_secret_access_key=AWS_SECRET_ACCESS_KEY, region_name=region)
response = client.list_streams()
if response.get('Streams') is None:
print("{} likely does not have DynamoDB permissions\n" .format(AWS_ACCESS_KEY_ID))
elif len(response['Streams']) <= 0:
print("[-] ListStreams allowed for {} but no results [-]" .format(region))
else:
print"### {} DynamoDB Streams ###" .format(region)
print("### {} DynamoDB Streams ###" .format(region))
for streams in response['Streams']:
pp.pprint(streams)
print("\n")

View File

@@ -49,7 +49,7 @@ def review_encrypted_volumes(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
if e.response['Error']['Code'] == 'UnauthorizedOperation':
print('{} : (UnauthorizedOperation) when calling the DescribeVolumes -- sure you have ec2 permissions?' .format(AWS_ACCESS_KEY_ID))
else:
print e
print(e)
except KeyboardInterrupt:
print("CTRL-C received, exiting...")
@@ -70,7 +70,7 @@ def get_instance_details(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
pp.pprint(i)
except botocore.exceptions.ClientError as e:
print e
print(e)
except KeyboardInterrupt:
print("CTRL-C received, exiting...")
@@ -93,7 +93,7 @@ def get_instance_volume_details(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
pp.pprint(volumes)
except botocore.exceptions.ClientError as e:
print e
print(e)
except KeyboardInterrupt:
print("CTRL-C received, exiting...")
@@ -117,7 +117,6 @@ def get_instance_volume_details2(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
print("\n")
except botocore.exceptions.ClientError as e:
print e
print(e)
except KeyboardInterrupt:
print("CTRL-C received, exiting...")

View File

@@ -27,7 +27,7 @@ def describe_repositories(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['repositories']) <= 0:
print("[-] DescribeRepositories allowed for {} but no results [-]" .format(region))
else:
print"### {} ECR Repositories ###" .format(region)
print("### {} ECR Repositories ###" .format(region))
for tables in response['repositories']:
pp.pprint(tables)
print("\n")

View File

@@ -27,7 +27,7 @@ def describe_applications(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['Applications']) <= 0:
print("[-] DescribeApplications allowed for {} but no results [-]" .format(region))
else:
print"### {} ElasticBeanstalk Applications ###" .format(region)
print("### {} ElasticBeanstalk Applications ###" .format(region))
for app in response['Applications']:
pp.pprint(app)
print("\n")
@@ -57,7 +57,7 @@ def describe_application_versions(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['ApplicationVersions']) <= 0:
print("[-] DescribeApplicationVersions allowed for {} but no results [-]" .format(region))
else:
print"### {} ElasticBeanstalk Application Versions ###" .format(region)
print("### {} ElasticBeanstalk Application Versions ###" .format(region))
for app in response['ApplicationVersions']:
pp.pprint(app)
print("\n")
@@ -87,7 +87,7 @@ def describe_configuration_options(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['Options']) <= 0:
print("[-] DescribeConfigurationOptions allowed for {} but no results [-]" .format(region))
else:
print"### {} ElasticBeanstalk Configuration Options ###" .format(region)
print("### {} ElasticBeanstalk Configuration Options ###" .format(region))
#if response['PlatformArn'] is None:
# pass
#else:
@@ -122,7 +122,7 @@ def describe_environments(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['Environments']) <= 0:
print("[-] DescribeEnvironments allowed for {} but no results [-]" .format(region))
else:
print"### {} ElasticBeanstalk Environments ###" .format(region)
print("### {} ElasticBeanstalk Environments ###" .format(region))
for enviro in response['Environments']:
pp.pprint(enviro)
print("\n")
@@ -152,7 +152,7 @@ def describe_events(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['Events']) <= 0:
print("[-] DescribeEvents allowed for {} but no results [-]" .format(region))
else:
print"### {} ElasticBeanstalk Events ###" .format(region)
print("### {} ElasticBeanstalk Events ###" .format(region))
for events in response['Events']:
pp.pprint(events)
print("\n")
@@ -166,4 +166,3 @@ def describe_events(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
print("Unexpected error: {}" .format(e))
except KeyboardInterrupt:
print("CTRL-C received, exiting...")

View File

@@ -27,7 +27,7 @@ def list_clusters(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['Clusters']) <= 0:
print("[-] ListClusters allowed for {} but no results [-]" .format(region))
else:
print"### {} EMR Clusters ###" .format(region)
print("### {} EMR Clusters ###" .format(region))
for app in response['Clusters']:
pp.pprint(app)
print("\n")
@@ -57,7 +57,7 @@ def list_security_configurations(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['SecurityConfigurations']) <= 0:
print("[-] ListSecurityConfigurations allowed for {} but no results [-]" .format(region))
else:
print"### {} EMR Security Configuration ###" .format(region)
print("### {} EMR Security Configuration ###" .format(region))
for app in response['SecurityConfigurations']:
pp.pprint(app)
print("\n")
@@ -71,4 +71,3 @@ def list_security_configurations(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
print("Unexpected error: {}" .format(e))
except KeyboardInterrupt:
print("CTRL-C received, exiting...")

View File

@@ -38,7 +38,7 @@ def check_root_account(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
print('User {} likely has console access and the password can be reset :-)' .format(user['UserName']))
print("Checking for MFA on account")
mfa = client.list_mfa_devices(UserName=user['UserName'])
print mfa['MFADevices']
print(mfa['MFADevices'])
except botocore.exceptions.ClientError as e:
if e.response['Error']['Code'] == 'NoSuchEntity':

View File

@@ -22,7 +22,7 @@ def describe_stacks(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
)
response = client.describe_stacks()
#debug
print response
print(response)
if response.get('Stacks') is None:
print("{} likely does not have Lambda permissions\n" .format(AWS_ACCESS_KEY_ID))
elif len(response['Stacks']) <= 0:

View File

@@ -25,6 +25,6 @@ def describe_db_instances(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
pp.pprint(i)
except botocore.exceptions.ClientError as e:
print e
print(e)
except KeyboardInterrupt:
print("CTRL-C received, exiting...")

View File

@@ -30,7 +30,7 @@ def list_geolocations(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
elif len(response['GeoLocationDetailsList']) <= 0:
print("[-] ListGeoLocations allowed for {} but no results [-]" .format(region))
else:
print"### {} Route53 GeoLocations ###" .format(region)
print("### {} Route53 GeoLocations ###" .format(region))
for app in response['GeoLocationDetailsList']:
pp.pprint(app)
print("\n")
@@ -44,5 +44,3 @@ def list_geolocations(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
print("Unexpected error: {}" .format(e))
except KeyboardInterrupt:
print("CTRL-C received, exiting...")

View File

@@ -55,6 +55,6 @@ for region in regions:
# pp.pprint(resourcetype['resourceTypes'][0])
ruleresponse = describe_configuration_recorders(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, region)
print ruleresponse
print(ruleresponse)
print_section_header_and_footer("END OF CONFIG SERVICE REVIEW", True)

View File

@@ -8,4 +8,5 @@ dirpath = os.getcwd()
foldername = os.path.dirname(os.path.realpath(__file__))
all_files = list_all_files(foldername)
__all__ = all_files

View File

@@ -3,7 +3,7 @@ if you have root or IAM access gather user info, manipulate access keys or passw
'''
from libs.iam import *
from libs.sts import *
from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
#from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
def step_cg_test():

0
target.txt Normal file
View File