Merge branch 'master' into stsroles

modules/aws/aws_lambda.py

@@ -1,7 +1,7 @@
 '''
 This file is used to list lambda functions and event mappings
 '''
-from libs.aws_lambda import *
+from libs.aws.aws_lambda import *
 
 
 def module_lambda_list_functions():

modules/aws/ce.py

@@ -4,7 +4,7 @@ usually have to be root or be specifically assigned the
 permission to get anything from this
 '''
 
-from libs.ce import *
+from libs.aws.ce import *
 
 
 def module_costexplorer_get_cost_and_usage():

modules/aws/cloudfront.py

@@ -2,7 +2,7 @@
 This file is used to perform some EMR actions
 '''
 
-from libs.cloudfront import *
+from libs.aws.cloudfront import *
 
 
 def module_cloudfront_list_distributions():

modules/aws/cloudtrail.py

@@ -1,7 +1,7 @@
 '''
 This file is used to perform cloudtrail actions
 '''
-from libs.cloudtrail import *
+from libs.aws.cloudtrail import *
 
 
 def module_cloudtrail_describe_trails():

modules/aws/cloudwatch.py

@@ -2,7 +2,7 @@
 example calling cloudwatch functions
 decribe alarms, describe alarm history, list metrics
 '''
-from libs.cloudwatch import *
+from libs.aws.cloudwatch import *
 
 
 def module_cloudwatch_describe_alarms():

modules/aws/config.py

@@ -2,7 +2,7 @@
 Module for interacting with the config service
 '''
 
-from libs.config import *
+from libs.aws.config import *
 
 
 def module_config_list_all_rules():

modules/aws/datapipeline.py

@@ -2,7 +2,7 @@
 datapipeline modules
 '''
 
-from libs.datapipeline import *
+from libs.aws.datapipeline import *
 
 
 def module_datapipeline_list_pipelines():

modules/aws/db.py

@@ -6,7 +6,7 @@ import boto3
 import sqlite3
 from sqlite3 import Error
 
-from libs.sql import *
+from libs.aws.sql import *
 
 session = boto3.Session()
 credentials = session.get_credentials()
@@ -21,21 +21,21 @@ def module_show_services_by_key():
     Show services for a given key service:sub_service
     example: elasticbeanstalk:DescribeEvents
     '''
-    results = search_recon_by_key(db_name, AWS_ACCESS_KEY_ID)
+    results = ["{}.{}".format(r[0], r[1]) for r in search_recon_by_key(db_name, AWS_ACCESS_KEY_ID)]
     print("Services enumerated for {}".format(AWS_ACCESS_KEY_ID))
-    for result in results:
-        print("{}:{}".format(result[0], result[1]))
+    for result in sorted(results):
+        print(result)
 
 
 def module_show_services_by_key_with_date():
     '''
     Show services for a given key service:sub_service
-    example: elasticbeanstalk:DescribeEvents
+    example: elasticbeanstalk:DescribeEvents -> Date: 2018-04-18 20:36:41.791780
     '''
-    results = search_recon_by_key(db_name, AWS_ACCESS_KEY_ID)
+    results = [("{}.{}".format(r[0], r[1]), r[2]) for r in search_recon_by_key(db_name, AWS_ACCESS_KEY_ID)]
     print("Services enumerated for {}".format(AWS_ACCESS_KEY_ID))
-    for result in results:
-        print("{}:{} -> Date: {}".format(result[0], result[1], result[2]))
+    for result, date in sorted(results, key=lambda r: r[0]):
+        print("{} -> Date: {}".format(result, date))
 
 # same as show_sevices
 
@@ -45,10 +45,10 @@ def module_list_services_by_key():
     Show services for a given key service:sub_service
     example: elasticbeanstalk:DescribeEvents
     '''
-    results = search_recon_by_key(db_name, AWS_ACCESS_KEY_ID)
+    results = ["{}.{}".format(r[0], r[1]) for r in search_recon_by_key(db_name, AWS_ACCESS_KEY_ID)]
     print("Services enumerated for {}".format(AWS_ACCESS_KEY_ID))
-    for result in results:
-        print("{}:{}".format(result[0], result[1]))
+    for result in sorted(results):
+        print(result)
 
 
 # for a key, what services does it have listed in the DB and the date
@@ -59,7 +59,7 @@ def module_list_services_by_key_with_date():
     Show services for a given key service:sub_service with date
     example: elasticbeanstalk:DescribeEvents -> Date: 2018-04-18 20:36:41.791780
     '''
-    results = search_recon_by_key(db_name, AWS_ACCESS_KEY_ID)
+    results = [("{}.{}".format(r[0], r[1]), r[2]) for r in search_recon_by_key(db_name, AWS_ACCESS_KEY_ID)]
     print("Services enumerated for {}".format(AWS_ACCESS_KEY_ID))
-    for result in results:
-        print("{}:{} -> Date: {}".format(result[0], result[1], result[2]))
+    for result, date in sorted(results, key=lambda r: r[0]):
+        print("{} -> Date: {}".format(result, date))

modules/aws/dynamodb.py

@@ -1,7 +1,7 @@
 '''
 dynamoDB examples
 '''
-from libs.dynamodb import *
+from libs.aws.dynamodb import *
 
 
 def module_dynamodb_list_tables():

modules/aws/dynamodbstreams.py

@@ -1,7 +1,7 @@
 '''
 dynamoDBstreams examples
 '''
-from libs.dynamodbstreams import *
+from libs.aws.dynamodbstreams import *
 
 
 def module_dynamodbstreams_list_streams():

modules/aws/ec2.py

@@ -2,7 +2,7 @@
 This file is used to perform various EC2 operations
 '''
 
-from libs.ec2 import *
+from libs.aws.ec2 import *
 
 
 def module_ec2_describe_instances_basic():

modules/aws/ecr.py

@@ -2,7 +2,7 @@
 ECR functions
 '''
 
-from libs.ecr import *
+from libs.aws.ecr import *
 
 
 def module_ecr_describe_repos():

modules/aws/elasticbeanstalk.py

@@ -1,7 +1,7 @@
 '''
 This file is used to perform some ElasticBeanstalk actions
 '''
-from libs.elasticbeanstalk import *
+from libs.aws.elasticbeanstalk import *
 
 
 '''

modules/aws/emr.py

@@ -2,7 +2,7 @@
 This file is used to perform some EMR actions
 '''
 
-from libs.emr import *
+from libs.aws.emr import *
 
 
 def module_emr_list_clusters():

modules/aws/firehose.py

@@ -1,7 +1,7 @@
 '''
 Firehose functions
 '''
-from libs.firehose import *
+from libs.aws.firehose import *
 
 
 def module_firehose_list_delivery_streams():

modules/aws/iam.py

@@ -2,7 +2,7 @@
 IAM recon functions
 '''
 
-from libs.iam import *
+from libs.aws.iam import *
 
 
 def module_iam_list_groups():

modules/aws/iam_pwn.py

@@ -2,8 +2,8 @@
 Functions specifically related to IAM account takeover if you have root or IAM access gather user info,
 manipulate access keys or passwords, make backdoor account
 '''
-from libs.iam import *
-from libs.sts import *
+from libs.aws.iam import *
+from libs.aws.sts import *
 
 
 def module_iam_get_account_summary():

modules/aws/lightsail.py

@@ -2,7 +2,7 @@
 Module for interacting with the lightsail
 '''
 
-from libs.lightsail import *
+from libs.aws.lightsail import *
 
 
 def module_lightsail_get_instances():

modules/aws/opsworks.py

@@ -1,4 +1,4 @@
-from libs.opsworks import *
+from libs.aws.opsworks import *
 
 
 def module_opsworks_describe_stacks():

modules/aws/pricing.py

@@ -4,7 +4,7 @@ usually have to be root or be specifically assigned the
 permission to get anything from this
 '''
 
-from libs.pricing import *
+from libs.aws.pricing import *
 
 
 def module_pricing_describe_services():

modules/aws/rds.py

@@ -2,7 +2,7 @@
 RDS module
 '''
 
-from libs.rds import *
+from libs.aws.rds import *
 
 
 def module_rds_describe_db_instances():

modules/aws/recon.py

@@ -3,14 +3,14 @@ This module handles the core recon functionality by asking all the services
 that have functions that done have arguments if we can access them :-)
 '''
 
-from libs.brute import *
-from libs.s3 import *
+from libs.aws.brute import *
+from libs.aws.s3 import *
 
 # for recon_defaults
-from libs.elasticbeanstalk import *
-from libs.opsworks import *
-from libs.route53 import *
-from libs.sts import *
+from libs.aws.elasticbeanstalk import *
+from libs.aws.opsworks import *
+from libs.aws.route53 import *
+from libs.aws.sts import *
 
 # maps to available services in boto 1.7.4
 

modules/aws/route53.py

@@ -2,13 +2,13 @@
 route53 functions
 '''
 
-from libs.route53 import *
+from libs.aws.route53 import *
 
 
 def module_route53_list_geolocations():
     '''
     Route53 list geolocations
-    
+
     python3 weirdAAL.py -m route53_list_geolocations -t demo
     '''
     list_geolocations()

modules/aws/s3.py

@@ -2,7 +2,7 @@
 S3 module
 '''
 
-from libs.s3 import *
+from libs.aws.s3 import *
 
 
 def module_s3_get_bucket_policy(*args):

modules/aws/ses.py

@@ -2,7 +2,7 @@
 SES module
 '''
 
-from libs.ses import *
+from libs.aws.ses import *
 
 
 def module_ses_list_identities():

modules/aws/sns.py

@@ -2,7 +2,7 @@
 SNS module
 '''
 
-from libs.sns import *
+from libs.aws.sns import *
 
 def module_sns_list_topics():
     '''
@@ -22,6 +22,13 @@ def module_sns_list_subscribers(*args):
     except IndexError:
         print("Please provide a topic arn *AND* region, ex: -a arn:aws:sns:us-east-1:123456789123:sometopic,us-east-1")
 
+def module_sns_list_all_subscribers():
+    '''
+    Rather than listing a single topics subscribers, we'll list all topics and all subscribersself.
+    python3 weirdAAL.py -m sns_list_all_subscribers
+    '''
+    list_all_sns_subscribers()
+
 def module_sns_delete_topic(*args):
     '''
     SNS delete a topic. Takes two arguments - the topic arn and the region.

modules/aws/sqs.py

@@ -2,7 +2,7 @@
 SQS Modules
 '''
 
-from libs.sqs import *
+from libs.aws.sqs import *
 
 
 def module_sqs_list_queues():

modules/aws/sts.py

@@ -2,7 +2,7 @@
 This file is used to perform some EMR actions
 '''
 
-from libs.sts import *
+from libs.aws.sts import *
 
 
 def module_sts_get_accountid():

modules/aws/translate.py

@@ -2,7 +2,7 @@
 Translate module
 '''
 
-from libs.translate import *
+from libs.aws.translate import *
 
 
 def module_translate_translate_text(*text):