From c0baa42b6d41e3549bb9e7b97d3b1d591f191466 Mon Sep 17 00:00:00 2001 From: Derek Graeber Date: Wed, 26 Jul 2023 08:56:32 -0400 Subject: [PATCH 1/2] syncing the solutions work for buckets --- CHANGELOG.md | 1 + modules/storage/buckets/stack.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f42d20e..c45484b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### **Changed** - replaced exporting metadata with seedfarmer command +- storage/buckets - added `usedforsecurity=False` to the sha1 creation of bucket names ### **Removed** diff --git a/modules/storage/buckets/stack.py b/modules/storage/buckets/stack.py index cb851aa3..b33ea75f 100755 --- a/modules/storage/buckets/stack.py +++ b/modules/storage/buckets/stack.py @@ -53,7 +53,9 @@ def __init__( Tags.of(scope=cast(IConstruct, self)).add(key="Deployment", value=full_dep_mod) artifact_bucket_name = f"{project_name}-{deployment_name}-artifacts-bucket-{hash}" - unique_ab = (hashlib.sha1(module_name.encode("UTF-8")).hexdigest())[: (60 - len(artifact_bucket_name))] + unique_ab = (hashlib.sha1(module_name.encode("UTF-8"), usedforsecurity=False).hexdigest())[ + : (60 - len(artifact_bucket_name)) + ] artifacts_bucket = aws_s3.Bucket( self, @@ -72,7 +74,9 @@ def __init__( ) log_bucket_name = f"{project_name}-{deployment_name}-logs-bucket-{hash}" - unique_log = (hashlib.sha1(module_name.encode("UTF-8")).hexdigest())[: (60 - len(log_bucket_name))] + unique_log = (hashlib.sha1(module_name.encode("UTF-8"), usedforsecurity=False).hexdigest())[ + : (60 - len(log_bucket_name)) + ] logs_bucket = aws_s3.Bucket( self, From d1e6009fea253cb9589b40d28c62e7ada70f5392 Mon Sep 17 00:00:00 2001 From: Derek Graeber Date: Wed, 26 Jul 2023 10:05:21 -0400 Subject: [PATCH 2/2] passing mypy --- modules/storage/buckets/stack.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/storage/buckets/stack.py b/modules/storage/buckets/stack.py index b33ea75f..a0f64b01 100755 --- a/modules/storage/buckets/stack.py +++ b/modules/storage/buckets/stack.py @@ -53,9 +53,9 @@ def __init__( Tags.of(scope=cast(IConstruct, self)).add(key="Deployment", value=full_dep_mod) artifact_bucket_name = f"{project_name}-{deployment_name}-artifacts-bucket-{hash}" - unique_ab = (hashlib.sha1(module_name.encode("UTF-8"), usedforsecurity=False).hexdigest())[ - : (60 - len(artifact_bucket_name)) - ] + unique_ab = ( + hashlib.sha1(module_name.encode("UTF-8"), usedforsecurity=False).hexdigest() # type: ignore[call-arg] + )[: (60 - len(artifact_bucket_name))] artifacts_bucket = aws_s3.Bucket( self, @@ -74,9 +74,9 @@ def __init__( ) log_bucket_name = f"{project_name}-{deployment_name}-logs-bucket-{hash}" - unique_log = (hashlib.sha1(module_name.encode("UTF-8"), usedforsecurity=False).hexdigest())[ - : (60 - len(log_bucket_name)) - ] + unique_log = ( + hashlib.sha1(module_name.encode("UTF-8"), usedforsecurity=False).hexdigest() # type: ignore[call-arg] + )[: (60 - len(log_bucket_name))] logs_bucket = aws_s3.Bucket( self,