Skip to content

fix: emit RFC 5987 filename* in Attachment/Inline #3058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sonnemusk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: emit RFC 5987 filename* in Attachment/Inline #3058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,14 @@ func (c *Context) Inline(file, name string) error {
var quoteEscaper = strings.NewReplacer("\\", "\\\\", `"`, "\\\"")

func (c *Context) contentDisposition(file, name, dispositionType string) error {
c.response.Header().Set(HeaderContentDisposition, fmt.Sprintf(`%s; filename="%s"`, dispositionType, quoteEscaper.Replace(name)))
// RFC 6266 / 5987: keep a quoted filename= for legacy clients and add
// filename* so non-ASCII and reserved characters survive download prompts.
c.response.Header().Set(HeaderContentDisposition, fmt.Sprintf(
`%s; filename="%s"; filename*=UTF-8''%s`,
dispositionType,
quoteEscaper.Replace(name),
url.PathEscape(name),
))
return c.File(file)
}

Expand Down
13 changes: 9 additions & 4 deletions context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,12 +431,17 @@ func TestContextAttachment(t *testing.T) {
{
name: "ok",
whenName: "walle.png",
expectHeader: `attachment; filename="walle.png"`,
expectHeader: `attachment; filename="walle.png"; filename*=UTF-8''walle.png`,
},
{
name: "ok, escape quotes in malicious filename",
whenName: `malicious.sh"; \"; dummy=.txt`,
expectHeader: `attachment; filename="malicious.sh\"; \\\"; dummy=.txt"`,
expectHeader: `attachment; filename="malicious.sh\"; \\\"; dummy=.txt"; filename*=UTF-8''malicious.sh%22%3B%20%5C%22%3B%20dummy=.txt`,
},
{
name: "ok, non-ASCII filename uses filename*",
whenName: "报告.pdf",
expectHeader: `attachment; filename="报告.pdf"; filename*=UTF-8''%E6%8A%A5%E5%91%8A.pdf`,
},
}
for _, tc := range testCases {
Expand Down Expand Up @@ -466,12 +471,12 @@ func TestContextInline(t *testing.T) {
{
name: "ok",
whenName: "walle.png",
expectHeader: `inline; filename="walle.png"`,
expectHeader: `inline; filename="walle.png"; filename*=UTF-8''walle.png`,
},
{
name: "ok, escape quotes in malicious filename",
whenName: `malicious.sh"; \"; dummy=.txt`,
expectHeader: `inline; filename="malicious.sh\"; \\\"; dummy=.txt"`,
expectHeader: `inline; filename="malicious.sh\"; \\\"; dummy=.txt"; filename*=UTF-8''malicious.sh%22%3B%20%5C%22%3B%20dummy=.txt`,
},
}
for _, tc := range testCases {
Expand Down
Loading