From 3bff9c4aea5f297c79bde7cd7fb92d8eb562c9ee Mon Sep 17 00:00:00 2001 From: Jonn Callahan Date: Wed, 27 Jun 2018 16:07:57 -0700 Subject: [PATCH 1/2] because sorting is better than not --- modules/db.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/db.py b/modules/db.py index cb18a9e..bc71771 100644 --- a/modules/db.py +++ b/modules/db.py @@ -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)) From 41fc45b8500c73bbbcc9a0d7e12d5e115ac7478d Mon Sep 17 00:00:00 2001 From: Jonn Callahan Date: Wed, 27 Jun 2018 16:15:46 -0700 Subject: [PATCH 2/2] updated the other funcs as well --- modules/db.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/db.py b/modules/db.py index bc71771..ec4f040 100644 --- a/modules/db.py +++ b/modules/db.py @@ -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