Skip to content

Update s3_enable_logging.py to use bucket policy instead of ACL #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kefoster951 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update s3_enable_logging.py to use bucket policy instead of ACL #162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1afdab3
Update s3_enable_logging.py
kefoster951 Sep 1, 2023
57b7796
Update s3_enable_logging.py
kefoster951 Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions bots/s3_enable_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ def run_action(boto_session,rule,entity,params):
bucket_logging = s3_resource.BucketLogging(bucket_name)

target_bucket_name = accountNumber + "s3accesslogs" + region

bucket_policy = '{"Version": "2012-10-17", \
"Statement": [ {"Sid": "S3ServerAccessLogsPolicy", \
"Effect": "Allow", "Principal": {"Service": "logging.s3.amazonaws.com"},\
"Action": "s3:PutObject", "Resource": "arn:aws:s3:::'+target_bucket_name+'/*"}]}'
#The target bucket needs to be in the same region as the remediation bucket or it'll throw a CrossLocationLoggingProhibitted error.
try:
#Check if the bucket exists. If not, create one
Expand All @@ -31,29 +34,36 @@ def run_action(boto_session,rule,entity,params):
try:
if region == "us-east-1":
result = s3_client.create_bucket(
Bucket=target_bucket_name,
ACL='log-delivery-write'
Bucket=target_bucket_name
)
elif region == "eu-west-1":
region = "EU"
result = s3_client.create_bucket(
Bucket=target_bucket_name,
CreateBucketConfiguration={'LocationConstraint': region},
ACL='log-delivery-write'
CreateBucketConfiguration={'LocationConstraint': region}
)
else:
result = s3_client.create_bucket(
Bucket=target_bucket_name,
CreateBucketConfiguration={'LocationConstraint': region},
ACL='log-delivery-write'
CreateBucketConfiguration={'LocationConstraint': region}
)

responseCode = result['ResponseMetadata']['HTTPStatusCode']
if responseCode >= 400:
text_output = "Unexpected error: %s \n" % str(result)
else:
text_output = "Logging bucket created %s \n" % target_bucket_name

try:
result = s3_client.put_bucket_policy(Bucket=target_bucket_name,Policy=bucket_policy)
except ClientError as e:
text_output = text_output + "Unexpected error: %s \n" % e

responseCode = result['ResponseMetadata']['HTTPStatusCode']
if responseCode >= 400:
text_output = text_output + "Unexpected error: %s \n" % str(result)
else:
text_output = text_output + "bucket policy created %s \n" % target_bucket_name

except ClientError as e:
text_output = "Unexpected error: %s \n" % e

Expand Down