fix: content-type charset (#415)

supabase · Jan 11, 2024 · 9b1f22b · 9b1f22b
1 parent 3909fd4
commit 9b1f22b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/storage/storage.ts b/src/storage/storage.ts
@@ -237,7 +237,9 @@ export class Storage {
         )
       }
 
-      if (!type.match(/^[a-zA-Z0-9\-\+]+\/([a-zA-Z0-9\-\+\.]+$)|\*$/)) {
+      if (
+        !type.match(/^([a-zA-Z0-9\-+.]+)\/([a-zA-Z0-9\-+.]+)(;\s*charset=[a-zA-Z0-9\-]+)?$|\*$/)
+      ) {
         throw new StorageBackendError(
           'invalid_mime_type',
           422,

diff --git a/src/storage/uploader.ts b/src/storage/uploader.ts
@@ -226,11 +226,13 @@ export class Uploader {
         continue
       }
 
-      if (allowedMime[0] === type && allowedMime[1] === '*') {
+      const [allowedType, allowedExtension] = allowedMime
+
+      if (allowedType === type && allowedExtension === '*') {
         return true
       }
 
-      if (allowedMime[0] === type && allowedMime[1] === ext) {
+      if (allowedType === type && allowedExtension === ext) {
         return true
       }
     }
@@ -267,7 +269,8 @@ export class Uploader {
         const cacheTime = formData.fields.cacheControl?.value
 
         body = formData.file
-        mimeType = formData.mimetype
+        /* @ts-expect-error: https://github.com/aws/aws-sdk-js-v3/issues/2085 */
+        mimeType = formData.fields.contentType?.value || formData.mimetype
         cacheControl = cacheTime ? `max-age=${cacheTime}` : 'no-cache'
         isTruncated = () => formData.file.truncated
       } catch (e) {