fix: AWS foundational security controls for S3.8 query reference (#13065)

candiduslynx · web-flow · commit 7cde3d2d063c · 2023-08-15T21:31:22.000Z
Closes #13064
diff --git a/plugins/source/aws/policies/foundational_security/s3.sql b/plugins/source/aws/policies/foundational_security/s3.sql
@@ -24,4 +24,4 @@
 
 \set check_id 'S3.8'
 \echo "Executing check S3.8"
-\ir ../queries/s3/account_level_public_access_blocks.sql
+\ir ../queries/s3/bucket_level_public_access_blocks.sql
diff --git a/plugins/source/aws/policies/queries/s3/bucket_level_public_access_blocks.sql b/plugins/source/aws/policies/queries/s3/bucket_level_public_access_blocks.sql
@@ -3,7 +3,7 @@ select
     :'execution_time' as execution_time,
     :'framework' as framework,
     :'check_id' as check_id,
-    'S3 Block Public Access (bucket) setting should be enabled' as title,
+    'S3 Block Public Access setting should be enabled at the bucket-level' as title,
     account_id,
     arn AS resource_id,
     case when
diff --git a/website/pages/docs/plugins/sources/aws/policies.md b/website/pages/docs/plugins/sources/aws/policies.md
@@ -394,6 +394,7 @@ AWS Foundational Security Best Practices performs the following checks:
   - S3 buckets should have server-side encryption enabled
   - S3 buckets should deny non-HTTPS requests
   - Amazon S3 permissions granted to other AWS accounts in bucket policies should be restricted
+  - S3 Block Public Access setting should be enabled at the bucket-level
   - Amazon SageMaker notebook instances should not have direct internet access
   - Secrets Manager secrets should have automatic rotation enabled
   - Secrets Manager secrets configured with automatic rotation should rotate successfully
diff --git a/website/tables/aws/aws_s3_buckets.md b/website/tables/aws/aws_s3_buckets.md
@@ -62,11 +62,12 @@ FROM
   INNER JOIN aws_s3_buckets AS b ON t.s3_bucket_name = b.name;
 ```
 
-### S3 Block Public Access (bucket) setting should be enabled
+### S3 Block Public Access setting should be enabled at the bucket-level
 
 ```sql
 SELECT
-  'S3 Block Public Access (bucket) setting should be enabled' AS title,
+  'S3 Block Public Access setting should be enabled at the bucket-level'
+    AS title,
   account_id,
   arn AS resource_id,
   CASE
