From dbf030639ad2691c6aa957650d51b0d3d55274a1 Mon Sep 17 00:00:00 2001 From: Zivko Sudarski <53841402+zivkos@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:05:14 +1300 Subject: [PATCH 1/2] Fix Incorrect file name from Download component DownloadServlet.java Incorrect file name from Download component for "inline" asset #2751 --- .../wcm/core/components/internal/servlets/DownloadServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServlet.java b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServlet.java index 5f0d5827de..e8cd7cb49f 100644 --- a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServlet.java +++ b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServlet.java @@ -191,7 +191,7 @@ private void sendResponse(InputStream stream, long size, String mimeType, String response.setContentLength((int) size); } if (inline) { - response.setHeader(CONTENT_DISPOSITION_HEADER, "inline"); + response.setHeader(CONTENT_DISPOSITION_HEADER, "inline; filename=\"" + filename + "\""); response.setHeader(CSP_HEADER, "sandbox"); } else { response.setHeader(CONTENT_DISPOSITION_HEADER, "attachment; filename=\"" + filename + "\""); From 874fad755b0f3591e13e24727c1b70473385940b Mon Sep 17 00:00:00 2001 From: Zivko Sudarski <53841402+zivkos@users.noreply.github.com> Date: Fri, 21 Feb 2025 13:54:58 +1300 Subject: [PATCH 2/2] Update DownloadServletTest.java --- .../core/components/internal/servlets/DownloadServletTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServletTest.java b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServletTest.java index 91bc5ec47b..8c27ec31d7 100644 --- a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServletTest.java +++ b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServletTest.java @@ -85,7 +85,7 @@ void testInlineAssetDownload() throws Exception { context.requestPathInfo().setExtension("pdf"); downloadServlet.doGet(context.request(), context.response()); assertTrue(context.response().containsHeader("Content-Disposition")); - assertEquals("inline", context.response().getHeader("Content-Disposition")); + assertEquals("inline; filename=\"Download_Test_PDF.pdf\"", context.response().getHeader("Content-Disposition")); assertTrue(context.response().containsHeader("Content-Security-Policy")); assertEquals("sandbox", context.response().getHeader("Content-Security-Policy")); assertEquals(8192, context.response().getBufferSize());