fix: encode content disposition file name (#8190)

* fix: encide content disposition file name Signed-off-by: Alexander Onnikov <[email protected]> * fix: recursively remove temporary directory Signed-off-by: Alexander Onnikov <[email protected]> --------- Signed-off-by: Alexander Onnikov <[email protected]>
hcengineering · Mar 11, 2025 · 03584ae · 03584ae
1 parent a89f75a
commit 03584ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/services/datalake/pod-datalake/src/handlers/blob.ts b/services/datalake/pod-datalake/src/handlers/blob.ts
@@ -64,7 +64,10 @@ export async function handleBlobGet (
   res.setHeader('Content-Length', blob.bodyLength.toString())
   res.setHeader('Content-Type', blob.contentType ?? '')
   res.setHeader('Content-Security-Policy', "default-src 'none';")
-  res.setHeader('Content-Disposition', filename !== undefined ? `attachment; filename="${filename}"` : 'attachment')
+  res.setHeader(
+    'Content-Disposition',
+    filename !== undefined ? `attachment; filename*=UTF-8''${encodeURIComponent(filename)}"` : 'attachment'
+  )
   res.setHeader('Cache-Control', blob.cacheControl ?? cacheControl)
   res.setHeader('Last-Modified', new Date(blob.lastModified).toUTCString())
   res.setHeader('ETag', blob.etag)

diff --git a/services/datalake/pod-datalake/src/handlers/image.ts b/services/datalake/pod-datalake/src/handlers/image.ts
@@ -165,7 +165,7 @@ export async function handleImageGet (
 
   res.on('finish', () => {
     try {
-      rmSync(tempDir)
+      rmSync(tempDir, { recursive: true })
     } catch (err: any) {
       ctx.error('failed to remove temp dir', { workspace, name, error: err })
     }