fix: base64 encode for metadata in headers (#519)

package.json

@@ -29,7 +29,7 @@
     "@aws-sdk/lib-storage": "3.515.0",
     "@aws-sdk/s3-request-presigner": "3.421.0",
     "@fastify/accepts": "^4.3.0",
-    "@fastify/multipart": "^7.6.0",
+    "@fastify/multipart": "^8.3.0",
     "@fastify/rate-limit": "^7.6.0",
     "@fastify/swagger": "^8.3.1",
     "@fastify/swagger-ui": "^1.7.0",

src/storage/uploader.ts

@@ -326,12 +326,9 @@ export class Uploader {
       const customMd = request.headers['x-metadata']
 
       if (typeof customMd === 'string') {
-        if (userMetadata && Buffer.byteLength(customMd, 'utf8') > MAX_CUSTOM_METADATA_SIZE) {
-          throw ERRORS.EntityTooLarge(undefined, 'metadata')
-        }
-
         try {
-          userMetadata = JSON.parse(customMd)
+          const json = Buffer.from(customMd, 'base64').toString('utf8')
+          userMetadata = JSON.parse(json)
         } catch (e) {
           // no-op
         }

src/test/object.test.ts

@@ -354,7 +354,7 @@ describe('testing POST object via multipart upload', () => {
     expect(S3Backend.prototype.uploadObject).toHaveBeenCalled()
   })
 
-  test('successfully uploading an object with custom metadata', async () => {
+  test('successfully uploading an object with custom metadata using form data', async () => {
     const form = new FormData()
     form.append('file', fs.createReadStream(`./src/test/assets/sadcat.jpg`))
     form.append(
@@ -395,6 +395,45 @@ describe('testing POST object via multipart upload', () => {
     })
   })
 
+  test('successfully uploading an object with custom metadata using stream', async () => {
+    const file = fs.createReadStream(`./src/test/assets/sadcat.jpg`)
+
+    const headers = {
+      authorization: `Bearer ${serviceKey}`,
+      'x-upsert': 'true',
+      'x-metadata': Buffer.from(
+        JSON.stringify({
+          test1: 'test1',
+          test2: 'test2',
+        })
+      ).toString('base64'),
+    }
+
+    const response = await app().inject({
+      method: 'POST',
+      url: '/object/bucket2/sadcat-upload3018.png',
+      headers,
+      payload: file,
+    })
+    expect(response.statusCode).toBe(200)
+    expect(S3Backend.prototype.uploadObject).toHaveBeenCalled()
+
+    const client = await getSuperuserPostgrestClient()
+
+    const object = await client
+      .table('objects')
+      .select('*')
+      .where('name', 'sadcat-upload3018.png')
+      .where('bucket_id', 'bucket2')
+      .first()
+
+    expect(object).not.toBeFalsy()
+    expect(object?.user_metadata).toEqual({
+      test1: 'test1',
+      test2: 'test2',
+    })
+  })
+
   test('fetch object metadata', async () => {
     const form = new FormData()
     form.append('file', fs.createReadStream(`./src/test/assets/sadcat.jpg`))
@@ -2121,7 +2160,7 @@ describe('testing list objects', () => {
     })
     expect(response.statusCode).toBe(200)
     const responseJSON = JSON.parse(response.body)
-    expect(responseJSON).toHaveLength(8)
+    expect(responseJSON).toHaveLength(9)
     const names = responseJSON.map((ele: any) => ele.name)
     expect(names).toContain('curlimage.jpg')
     expect(names).toContain('private')