diff --git a/apps/api/plane/settings/storage.py b/apps/api/plane/settings/storage.py index 1087cad0f..e7b6601d9 100644 --- a/apps/api/plane/settings/storage.py +++ b/apps/api/plane/settings/storage.py @@ -87,13 +87,21 @@ class S3Storage(S3Boto3Storage): """ if expiration is None: expiration = self.signed_url_expiration + # Default to application/octet-stream when caller passes empty/None. + # The file-type library Plane's frontend uses returns "" for unsniffable + # formats (plain text, .json, etc.), which would sign a presigned URL + # with `Content-Type=""`. Browsers can't reliably send an empty + # Content-Type header, so the SigV4 signature would never match and PUT + # would 403. We resolve this by signing a definite default; the + # frontend then sends the signed value verbatim (see helper.ts). + signed_content_type = file_type or "application/octet-stream" try: url = self.s3_client.generate_presigned_url( "put_object", Params={ "Bucket": self.aws_storage_bucket_name, "Key": object_name, - "ContentType": file_type, + "ContentType": signed_content_type, }, ExpiresIn=expiration, HttpMethod="PUT", @@ -105,7 +113,7 @@ class S3Storage(S3Boto3Storage): return { "url": url, "method": "PUT", - "fields": {"Content-Type": file_type, "key": object_name}, + "fields": {"Content-Type": signed_content_type, "key": object_name}, } def _get_content_disposition(self, disposition, filename=None): diff --git a/packages/services/src/file/helper.ts b/packages/services/src/file/helper.ts index c7ac56015..3f4518493 100644 --- a/packages/services/src/file/helper.ts +++ b/packages/services/src/file/helper.ts @@ -87,13 +87,19 @@ export const generateFileUploadPayload = ( headers: { "Content-Type": "multipart/form-data" }, }; } + // Content-Type MUST exactly match what the backend signed in the presigned + // PUT URL — the AWS SigV4 signature includes Content-Type as a signed header. + // If we send the browser's `file.type` (which guesses from extension) but + // the backend signed `fileMetaData.type` (from the file-type library, which + // sniffs file magic bytes), they often disagree and R2 returns 403 + // SignatureDoesNotMatch. Always prefer the signed value. + const signedContentType = + data.fields["Content-Type"] || file.type || "application/octet-stream"; return { url: data.url, method: "PUT", body: file, - headers: { - "Content-Type": file.type || data.fields["Content-Type"] || "application/octet-stream", - }, + headers: { "Content-Type": signedContentType }, }; };