|
| 1 | +import hashlib |
| 2 | + |
1 | 3 | import requests |
2 | 4 | import uuid |
3 | 5 | import os |
|
6 | 8 | from PIL import Image |
7 | 9 | from dotenv import load_dotenv |
8 | 10 |
|
| 11 | +from botocore.auth import SigV4Auth |
| 12 | +from botocore.awsrequest import AWSRequest |
| 13 | +from botocore.credentials import Credentials |
| 14 | + |
9 | 15 | load_dotenv() |
10 | 16 |
|
11 | 17 | MIME_TO_FORMAT: Dict[str, List[str]] = { |
@@ -63,6 +69,49 @@ def get_s3_bucket_uri() -> str: |
63 | 69 | return s3_uri |
64 | 70 |
|
65 | 71 |
|
| 72 | +def get_aws_signed_request(full_url, buffer, mime_type): |
| 73 | + credentials = Credentials( |
| 74 | + access_key=os.environ['AWS_ACCESS_KEY_ID'], |
| 75 | + secret_key=os.environ['AWS_SECRET_ACCESS_KEY'], |
| 76 | + ) |
| 77 | + |
| 78 | + if hasattr(buffer, 'read'): |
| 79 | + # It's a file-like object (BytesIO, etc.) |
| 80 | + current_pos = buffer.tell() # Save current position |
| 81 | + buffer.seek(0) # Go to start |
| 82 | + data = buffer.read() # Read all data |
| 83 | + buffer.seek(current_pos) # Restore position |
| 84 | + else: |
| 85 | + # It's already bytes |
| 86 | + data = buffer |
| 87 | + |
| 88 | + # Calculate content hash and length |
| 89 | + content_hash = hashlib.sha256(data).hexdigest() |
| 90 | + content_length = len(data) |
| 91 | + |
| 92 | + # Create the request for signing with required headers |
| 93 | + headers = { |
| 94 | + 'Content-Type': mime_type, |
| 95 | + 'Content-Length': str(content_length), |
| 96 | + 'x-amz-content-sha256': content_hash |
| 97 | + } |
| 98 | + |
| 99 | + # Create the request for signing |
| 100 | + aws_request = AWSRequest( |
| 101 | + method='PUT', |
| 102 | + url=full_url, |
| 103 | + data=buffer, |
| 104 | + headers=headers |
| 105 | + ) |
| 106 | + |
| 107 | + region = os.environ.get('AWS_REGION', 'eu-west-2') |
| 108 | + |
| 109 | + # Sign the request |
| 110 | + SigV4Auth(credentials, 's3', region).add_auth(aws_request) |
| 111 | + |
| 112 | + return aws_request |
| 113 | + |
| 114 | + |
66 | 115 | def upload_image(img: Image.Image) -> str: |
67 | 116 | """Upload PIL image with comprehensive MIME type validation |
68 | 117 |
|
@@ -95,10 +144,13 @@ def upload_image(img: Image.Image) -> str: |
95 | 144 | img.save(buffer, format=img_format) |
96 | 145 | buffer.seek(0) |
97 | 146 |
|
98 | | - response: requests.Response = requests.put( |
99 | | - full_url, |
100 | | - data=buffer, |
101 | | - headers={'Content-Type': mime_type}, |
| 147 | + aws_request = get_aws_signed_request(full_url, buffer, mime_type).prepare() |
| 148 | + |
| 149 | + response: requests.Response = requests.request( |
| 150 | + method=aws_request.method, |
| 151 | + url=aws_request.url, |
| 152 | + data=aws_request.body, |
| 153 | + headers=aws_request.headers, |
102 | 154 | timeout=30 |
103 | 155 | ) |
104 | 156 |
|
|
0 commit comments