aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-17 22:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add S3 region support (#2188)

Browse Source 
Co-authored-by: Smyler <smyler@hackademint.org>
This commit is contained in:
Smyler
2022-09-30 09:46:47 +02:00
committed by GitHub
parent 02c08f50cc
commit eb66034aae
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/utils/test_uploaders.py
View File

@@ -10,8 +10,10 @@ from tests.helpers import create_ctfd, destroy_ctfd
@mock_s3
def test_s3_uploader():
conn = boto3.resource("s3", region_name="us-east-1")
conn.create_bucket(Bucket="bucket")
conn = boto3.resource("s3", region_name="test-region")
conn.create_bucket(
Bucket="bucket", CreateBucketConfiguration={"LocationConstraint": "test-region"}
)
app = create_ctfd()
with app.app_context():
@@ -19,6 +21,7 @@ def test_s3_uploader():
app.config["AWS_ACCESS_KEY_ID"] = "AKIAIOSFODNN7EXAMPLE"
app.config["AWS_SECRET_ACCESS_KEY"] = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
app.config["AWS_S3_BUCKET"] = "bucket"
app.config["AWS_S3_REGION"] = "test-region"
uploader = S3Uploader()
@@ -34,8 +37,10 @@ def test_s3_uploader():
@mock_s3
def test_s3_sync():
conn = boto3.resource("s3", region_name="us-east-1")
conn.create_bucket(Bucket="bucket")
conn = boto3.resource("s3", region_name="test-region")
conn.create_bucket(
Bucket="bucket", CreateBucketConfiguration={"LocationConstraint": "test-region"}
)
app = create_ctfd()
with app.app_context():
@@ -43,6 +48,7 @@ def test_s3_sync():
app.config["AWS_ACCESS_KEY_ID"] = "AKIAIOSFODNN7EXAMPLE"
app.config["AWS_SECRET_ACCESS_KEY"] = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
app.config["AWS_S3_BUCKET"] = "bucket"
app.config["AWS_S3_REGION"] = "test-region"
uploader = S3Uploader()
uploader.sync()