From 004f0e7f0b15700366e34cd310eba6f6467926b3 Mon Sep 17 00:00:00 2001 From: carnal0wnage Date: Mon, 12 Jun 2017 22:10:19 -0400 Subject: [PATCH] updates --- s3/s3.py | 28 ++++++++++++++-------------- s3_list_buckets_for_acct.py | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/s3/s3.py b/s3/s3.py index 937364f..93b822b 100644 --- a/s3/s3.py +++ b/s3/s3.py @@ -26,13 +26,13 @@ def get_s3bucket_policy(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, bucket): print "KeyError havent tracked down reason yet" except botocore.exceptions.ClientError as e: if e.response['Error']['Code'] == 'AccessDenied': - print('%s : cant list s3 bucket [AccessDenied]' % AWS_ACCESS_KEY_ID) + print('{} : cant list s3 bucket [AccessDenied]' .format(AWS_ACCESS_KEY_ID)) elif e.response['Error']['Code'] == 'NoSuchBucketPolicy': print('%s: Has No S3 Policy!' % bucket['Name']) elif e.response['Error']['Code'] == 'AllAccessDisabled': - print('%s : cant list s3 bucket [AllAccessDisabled]' % AWS_ACCESS_KEY_ID) + print('{} : cant list s3 bucket [AllAccessDisabled]' .format(AWS_ACCESS_KEY_ID)) else: - print "Unexpected error: %s" % e + print "Unexpected error: {}" .format(e) try: policy = client.get_bucket_policy(Bucket=bucket) @@ -44,14 +44,14 @@ def get_s3bucket_policy(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, bucket): pass except botocore.exceptions.ClientError as e: if e.response['Error']['Code'] == 'AccessDenied': - print('%s : cant list s3 bucket policy [AccessDenied]' % AWS_ACCESS_KEY_ID) + print('{} : cant list s3 bucket policy [AccessDenied]' .format(AWS_ACCESS_KEY_ID)) elif e.response['Error']['Code'] == 'NoSuchBucketPolicy': - print('%s: Has No S3 Policy!' % bucket) + print('{}: Has No S3 Policy!' .format(bucket)) print("\n") elif e.response['Error']['Code'] == 'AllAccessDisabled': - print('%s : cant list s3 bucket policy [AllAccessDisabled]' % AWS_ACCESS_KEY_ID) + print('{} : cant list s3 bucket policy [AllAccessDisabled]' .format(AWS_ACCESS_KEY_ID)) else: - print "Unexpected error: %s" % e + print "Unexpected error: {}" .format(e) try: acl = client.get_bucket_acl(Bucket=bucket) @@ -63,22 +63,22 @@ def get_s3bucket_policy(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, bucket): pass except botocore.exceptions.ClientError as e: if e.response['Error']['Code'] == 'AccessDenied': - print('%s : cant list s3 bucket acl [AccessDenied]' % AWS_ACCESS_KEY_ID) + print('{} : cant list s3 bucket acl [AccessDenied]' .format(AWS_ACCESS_KEY_ID)) elif e.response['Error']['Code'] == 'NoSuchBucketPolicy': - print('%s: Has No S3 Policy!' % bucket) + print('{}: Has No S3 Policy!' .format(bucket)) print("\n") elif e.response['Error']['Code'] == 'AllAccessDisabled': - print('%s : cant list s3 bucket acl [AllAccessDisabled]' % AWS_ACCESS_KEY_ID) + print('{} : cant list s3 bucket acl [AllAccessDisabled]' .format(AWS_ACCESS_KEY_ID)) else: - print "Unexpected error: %s" % e + print "Unexpected error: {}" .format(e) except botocore.exceptions.ClientError as e: if e.response['Error']['Code'] == 'InvalidClientTokenId': sys.exit("The AWS KEY IS INVALID. Exiting") elif e.response['Error']['Code'] == 'NotSignedUp': - print('%s : doesnt have s3 access' % AWS_ACCESS_KEY_ID) + print('{} : doesnt have s3 access' .format(AWS_ACCESS_KEY_ID)) else: - print "Unexpected error: %s" % e + print "Unexpected error: {}" .format(e) #specifically get the acl on a file in a buckeet def get_s3object_acl(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, bucket, myfile): @@ -105,7 +105,7 @@ def get_s3object_acl(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, bucket, myfile): print "Unexpected error: {}" .format(e) #given an aws keypair what s3 assets does it have permission to -def get_s3objects_foraccount(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY): +def get_s3objects_for_account(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY): client = boto3.resource( 's3', aws_access_key_id=AWS_ACCESS_KEY_ID, diff --git a/s3_list_buckets_for_acct.py b/s3_list_buckets_for_acct.py index 111970c..f2dd291 100644 --- a/s3_list_buckets_for_acct.py +++ b/s3_list_buckets_for_acct.py @@ -20,4 +20,4 @@ AWS_SECRET_ACCESS_KEY ='' #client = boto3.resource('s3') #for bucket in client.buckets.all(): # print(bucket.name) -get_s3objects_foraccount(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY) \ No newline at end of file +get_s3objects_for_account(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY) \ No newline at end of file