dash/weirdAAL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53 from nvisium-jonn-callahan/master

Browse Source 
because sorting is better than not
This commit is contained in:
Chris Gates
2018-06-28 17:15:35 -04:00
committed by GitHub
parent b59f75abbf 41fc45b850
commit 92f229ecf4
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/db.py
View File

@@ -21,21 +21,21 @@ def module_show_services_by_key():
Show services for a given key service:sub_service Show services for a given key service:sub_service
example: elasticbeanstalk:DescribeEvents 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)) print("Services enumerated for {}".format(AWS_ACCESS_KEY_ID))
for result in results: for result in sorted(results):
print("{}:{}".format(result[0], result[1])) print(result)
def module_show_services_by_key_with_date(): def module_show_services_by_key_with_date():
''' '''
Show services for a given key service:sub_service 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)) print("Services enumerated for {}".format(AWS_ACCESS_KEY_ID))
for result in results: for result, date in sorted(results, key=lambda r: r[0]):
print("{}:{} -> Date: {}".format(result[0], result[1], result[2])) print("{} -> Date: {}".format(result, date))
# same as show_sevices # same as show_sevices
@@ -45,10 +45,10 @@ def module_list_services_by_key():
Show services for a given key service:sub_service Show services for a given key service:sub_service
example: elasticbeanstalk:DescribeEvents 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)) print("Services enumerated for {}".format(AWS_ACCESS_KEY_ID))
for result in results: for result in sorted(results):
print("{}:{}".format(result[0], result[1])) print(result)
# for a key, what services does it have listed in the DB and the date # 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 Show services for a given key service:sub_service with date
example: elasticbeanstalk:DescribeEvents -> Date: 2018-04-18 20:36:41.791780 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)) print("Services enumerated for {}".format(AWS_ACCESS_KEY_ID))
for result in results: for result, date in sorted(results, key=lambda r: r[0]):
print("{}:{} -> Date: {}".format(result[0], result[1], result[2])) print("{} -> Date: {}".format(result, date))