fix: copy metadata upstream

fixes #1109

Signed-off-by: ferhat elmas <elmas.ferhat@gmail.com>

Author: ferhatelmas

acceptance/API_COVERAGE.md

@@ -14,7 +14,7 @@ These run in `smoke` / `core` profiles and are included in the default local CI
 | Auth/error contracts   | malformed JWT rejection and missing protected-route authorization mapped to explicit auth errors                                                                                                                                                                                                                                                                                         |
 | REST buckets           | create, duplicate create rejection, get, list/search, update, empty, empty already-empty bucket, delete, deletion blocked when non-empty                                                                                                                                                                                                                                                 |
 | REST objects           | upload, update, duplicate protection, bucket file-size limit and MIME policy rejection, user metadata, authenticated read/head/info with ETag/length checks, public read/head/info, public missing-key info/head, special-character key read/list, single delete, missing-key info/head behavior                                                                                         |
-| REST object operations | empty bucket list-v1/list-v2, list-v1 search/offset, list-v2 delimiter/cursor/sort, signed URL, batch signed URLs, signed upload URL, invalid signed upload token, copy, copy without upsert when destination exists, same-bucket and cross-bucket move, move conflict, bulk delete                                                                                                      |
+| REST object operations | empty bucket list-v1/list-v2, list-v1 search/offset, list-v2 delimiter/cursor/sort, signed URL, batch signed URLs, signed upload URL, invalid signed upload token, copy, copy metadata/cache-control overwrite, copy without upsert when destination exists, same-bucket and cross-bucket move, move conflict, bulk delete                                                               |
 | DB adapter pinning     | LIKE-wildcard escaping for bucket search and list-v2 prefix, list-v2 cursor pagination with sortBy on `created_at`/`updated_at`, list-v2 delimiter common-prefix walk, literal-underscore keys                                                                                                                                                                                           |
 | S3 buckets             | CreateBucket, duplicate CreateBucket conflict, HeadBucket, ListBuckets, GetBucketLocation, GetBucketVersioning, DeleteBucket, DeleteBucket non-empty conflict                                                                                                                                                                                                                            |
 | S3 objects             | PutObject metadata/cache-control, presigned POST form upload, HeadObject, HeadObject missing-key 404, GetObject metadata, GetObjectTagging empty tag-set contract, conditional GetObject (`If-None-Match`, `If-Modified-Since`), response header overrides, Range GetObject (suffix/last-N/out-of-range), basic CopyObject, CopyObject metadata replacement, DeleteObject, DeleteObjects |

acceptance/specs/rest-extended.test.ts

@@ -24,6 +24,8 @@ interface BucketResponse {
 
 interface ObjectInfoResponse {
   bucket_id?: string
+  cache_control?: string | null
+  content_type?: string | null
   metadata?: Record<string, unknown> | null
   name?: string
 }
@@ -736,6 +738,75 @@ describeAcceptance(
       }
     })
 
+    it('serves updated cache-control after copy overwrites object metadata', async () => {
+      const client = createRestClient()
+      const token = requireServiceKey()
+      const bucketName = uniqueBucketName('copycache')
+      const objectKey = uniqueObjectKey('copy-cache')
+      const initialCacheControl = 'max-age=60'
+      const updatedCacheControl = 'max-age=604800'
+      const payload = 'cache-control-copy-body'
+
+      try {
+        await createRestBucket(bucketName, { isPublic: false })
+
+        await client.request('POST', `/object/${bucketName}/${encodePathSegments(objectKey)}`, {
+          body: payload,
+          expectedStatus: 200,
+          headers: {
+            'cache-control': initialCacheControl,
+            'content-type': 'text/plain',
+            'x-upsert': 'true',
+          },
+          token,
+        })
+
+        const beforeCopy = await client.request(
+          'GET',
+          `/object/authenticated/${bucketName}/${encodePathSegments(objectKey)}`,
+          { expectedStatus: 200, token }
+        )
+        expect(beforeCopy.body).toBe(payload)
+        expect(beforeCopy.headers.get('cache-control')).toBe(initialCacheControl)
+
+        await client.request('POST', '/object/copy', {
+          body: {
+            bucketId: bucketName,
+            copyMetadata: false,
+            destinationKey: objectKey,
+            metadata: {
+              cacheControl: updatedCacheControl,
+            },
+            sourceKey: objectKey,
+          },
+          expectedStatus: 200,
+          headers: {
+            'x-upsert': 'true',
+          },
+          token,
+        })
+
+        const afterCopy = await client.request(
+          'GET',
+          `/object/authenticated/${bucketName}/${encodePathSegments(objectKey)}`,
+          { expectedStatus: 200, token }
+        )
+        expect(afterCopy.body).toBe(payload)
+        expect(afterCopy.headers.get('cache-control')).toBe(updatedCacheControl)
+        expect(afterCopy.headers.get('content-type')).toBe('text/plain')
+
+        const info = await client.request<ObjectInfoResponse>(
+          'GET',
+          `/object/info/authenticated/${bucketName}/${encodePathSegments(objectKey)}`,
+          { expectedStatus: 200, token }
+        )
+        expect(info.json?.cache_control).toBe(updatedCacheControl)
+        expect(info.json?.content_type).toBe('text/plain')
+      } finally {
+        await cleanupRestResources(bucketName, [objectKey], client)
+      }
+    })
+
     it('enforces bucket file-size limits on REST uploads', async () => {
       const config = getAcceptanceConfig()
       const client = createRestClient()

acceptance/specs/s3.test.ts

@@ -589,6 +589,9 @@ describeAcceptance(
             ContentType: 'application/json',
             CopySource: `${bucketName}/${keyA}`,
             Key: metadataReplacedKey,
+            Metadata: {
+              copied: 'yes',
+            },
             MetadataDirective: 'REPLACE',
           })
         )
@@ -597,6 +600,7 @@ describeAcceptance(
         )
         expect(metadataReplaced.CacheControl).toBe('max-age=91')
         expect(metadataReplaced.ContentType).toBe('application/json')
+        expect(metadataReplaced.Metadata).toMatchObject({ copied: 'yes' })
 
         const multipartCopy = await client.send(
           new CreateMultipartUploadCommand({

src/http/routes/object/copyObject.ts

@@ -73,6 +73,7 @@ export default async function routes(fastify: FastifyInstance) {
           typeof userMetadata === 'string' ? parseUserMetadata(userMetadata) : undefined,
         metadata,
         copyMetadata: request.body.copyMetadata ?? true,
+        preserveUnspecifiedFileMetadata: true,
         upsert: request.headers['x-upsert'] === 'true',
         uploadType: 'standard',
       })

src/http/routes/s3/commands/copy-object.ts

@@ -37,13 +37,15 @@ export default function CopyObject(s3Router: S3Router) {
     { schema: CopyObjectInput, operation: ROUTE_OPERATIONS.S3_COPY_OBJECT },
     (req, ctx) => {
       const s3Protocol = new S3ProtocolHandler(ctx.storage, ctx.tenantId, ctx.owner)
+      const metadata = s3Protocol.parseMetadataHeaders(req.Headers)
 
       return s3Protocol.copyObject({
         Bucket: req.Params.Bucket,
         Key: req.Params['*'],
         CopySource: req.Headers['x-amz-copy-source'],
         ContentType: req.Headers['content-type'],
         CacheControl: req.Headers['cache-control'],
+        Metadata: metadata,
         MetadataDirective: req.Headers['x-amz-metadata-directive'] as MetadataDirective | undefined,
         Expires: req.Headers.expires ? new Date(req.Headers.expires) : undefined,
         ContentEncoding: req.Headers['content-encoding'],

src/storage/backend/adapter.ts

@@ -44,6 +44,10 @@ export type UploadPart = {
   ChecksumSHA256?: string
 }
 
+export type CopyObjectOptions = {
+  copyMetadata?: boolean
+}
+
 /**
  * A generic storage Adapter to interact with files
  */
@@ -135,7 +139,8 @@ export abstract class StorageBackendAdapter {
       ifNoneMatch?: string
       ifModifiedSince?: Date
       ifUnmodifiedSince?: Date
-    }
+    },
+    options?: CopyObjectOptions
   ): Promise<Pick<ObjectMetadata, 'httpStatusCode' | 'eTag' | 'lastModified'>> {
     throw new Error('copyObject not implemented')
   }