diff --git a/platform-report/src/main/java/com/eip4/platform/report/ReportController.java b/platform-report/src/main/java/com/eip4/platform/report/ReportController.java index c7cc2f2..8fcda6a 100644 --- a/platform-report/src/main/java/com/eip4/platform/report/ReportController.java +++ b/platform-report/src/main/java/com/eip4/platform/report/ReportController.java @@ -13,6 +13,7 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -94,9 +95,17 @@ public class ReportController { "读取/渲染报表模板失败: " + e.getMessage(), e); } - return ResponseEntity.ok() - .contentType(MediaType.parseMediaType(fmt.contentType())) - .body(body); + ResponseEntity.BodyBuilder rb = ResponseEntity.ok() + .contentType(MediaType.parseMediaType(fmt.contentType())); + // pdf/xls(导出按钮)→ attachment 触发下载,文件名取报表名;html(查看器 iframe)→ inline 内嵌。 + if (fmt != ReportService.Format.HTML) { + String reportName = templateRepository.loadReportName(templateId); + String disposition = contentDisposition(fmt, reportName, templateId); + if (disposition != null) { + rb.header(HttpHeaders.CONTENT_DISPOSITION, disposition); + } + } + return rb.body(body); } /** @@ -176,6 +185,46 @@ public class ReportController { return env; } + /** + * 构造导出下载的 {@code Content-Disposition} 头值。 + *
查看器 iframe 用 {@code format=html}(inline,内嵌渲染);导出按钮用 {@code format=pdf|xls} + * → 端点须回 {@code Content-Disposition: attachment} 触发下载,文件名取报表名(中文经 RFC5987 + * {@code filename*=UTF-8''} 编码),ASCII 回退用 templateId(UUID,老客户端兜底)。html 不设此头。 + */ +class ReportDownloadTest { + + @Test + void html_inline_no_disposition() { + assertNull(ReportController.contentDisposition(ReportService.Format.HTML, "在建项目收付款信息表", "tid-1")); + } + + @Test + void pdf_attachment_with_rfc5987_cjk_filename() { + String cd = ReportController.contentDisposition(ReportService.Format.PDF, "在建项目收付款信息表", "5558497f-id"); + assertTrue(cd.startsWith("attachment;"), cd); + // RFC5987 UTF-8 编码的中文名 + .pdf + assertTrue(cd.contains("filename*=UTF-8''"), cd); + assertTrue(cd.contains("%E5%9C%A8%E5%BB%BA"), cd); // 「在建」UTF-8 %xx + assertTrue(cd.contains(".pdf"), cd); + // ASCII 回退用 templateId(UUID 安全) + assertTrue(cd.contains("filename=\"5558497f-id.pdf\""), cd); + } + + @Test + void xls_uses_xls_extension() { + String cd = ReportController.contentDisposition(ReportService.Format.XLS, "报表", "tid"); + assertTrue(cd.contains(".xls"), cd); + assertFalse(cd.contains(".pdf"), cd); + } + + @Test + void header_injection_neutralized() { + // 报表名含 CRLF/引号/路径分隔 → 必须剔除,杜绝响应头注入(CRLF 拆头)与 filename 属性逃逸 + String evil = "a\r\nSet-Cookie: x=1\"/../b"; + String cd = ReportController.contentDisposition(ReportService.Format.PDF, evil, "tid"); + assertFalse(cd.contains("\r"), "不得含 CR: " + cd); + assertFalse(cd.contains("\n"), "不得含 LF: " + cd); + // ASCII filename 用 templateId(UUID),不被恶意报表名污染、无逃逸引号 + assertTrue(cd.contains("filename=\"tid.pdf\""), cd); + } + + @Test + void blank_name_falls_back_to_templateId() { + String cd = ReportController.contentDisposition(ReportService.Format.PDF, " ", "tid-xyz"); + assertTrue(cd.contains("tid-xyz.pdf"), cd); + } +}