ghndrx/prowler
1
0
Fork 0
mirror of https://github.com/ghndrx/prowler.git synced 2026-02-10 14:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(s3): Handle NoSuchBucket in the service (#3173)

Browse Source
This commit is contained in:
Pepe Fagoaga
2023-12-11 09:36:26 +01:00
committed by GitHub
parent ee215b1ced
commit 694aa448a4
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
prowler/providers/aws/services/s3/s3_service.py
View File

@@ -101,6 +101,15 @@ class S3(AWSService):
if "MFADelete" in bucket_versioning: if "MFADelete" in bucket_versioning:
if "Enabled" == bucket_versioning["MFADelete"]: if "Enabled" == bucket_versioning["MFADelete"]:
bucket.mfa_delete = True bucket.mfa_delete = True
except ClientError as error:
if error.response["Error"]["Code"] == "NoSuchBucket":
logger.warning(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
else:
logger.error(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
except Exception as error: except Exception as error:
if bucket.region: if bucket.region:
logger.error( logger.error(
@@ -153,6 +162,15 @@ class S3(AWSService):
bucket.logging_target_bucket = bucket_logging["LoggingEnabled"][ bucket.logging_target_bucket = bucket_logging["LoggingEnabled"][
"TargetBucket" "TargetBucket"
] ]
except ClientError as error:
if error.response["Error"]["Code"] == "NoSuchBucket":
logger.warning(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
else:
logger.error(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
except Exception as error: except Exception as error:
if regional_client: if regional_client:
logger.error( logger.error(
@@ -224,6 +242,15 @@ class S3(AWSService):
grantee.permission = grant["Permission"] grantee.permission = grant["Permission"]
grantees.append(grantee) grantees.append(grantee)
bucket.acl_grantees = grantees bucket.acl_grantees = grantees
except ClientError as error:
if error.response["Error"]["Code"] == "NoSuchBucket":
logger.warning(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
else:
logger.error(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
except Exception as error: except Exception as error:
if regional_client: if regional_client:
logger.error( logger.error(
@@ -241,6 +268,15 @@ class S3(AWSService):
bucket.policy = json.loads( bucket.policy = json.loads(
regional_client.get_bucket_policy(Bucket=bucket.name)["Policy"] regional_client.get_bucket_policy(Bucket=bucket.name)["Policy"]
) )
except ClientError as error:
if error.response["Error"]["Code"] == "NoSuchBucket":
logger.warning(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
else:
logger.error(
f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
except Exception as error: except Exception as error:
if "NoSuchBucketPolicy" in str(error): if "NoSuchBucketPolicy" in str(error):
bucket.policy = {} bucket.policy = {}