Skip to content

It's ok to encode the file name in Content-Disposition header, but it… #799

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

Merged
iroqueta merged 2 commits into from
Nov 10, 2023
Merged

It's ok to encode the file name in Content-Disposition header, but it… #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ab75e5
It's ok to encode the file name in Content-Disposition header, but it…
iroqueta Nov 7, 2023
db1647f
Merge branch 'master' into ContentDispositionFileNameWithBlanks
iroqueta Nov 10, 2023
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
2 changes: 1 addition & 1 deletion java/src/main/java/com/genexus/webpanels/WebUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ public static String getEncodedContentDisposition(String value, int browserType)
}

String filename = value.substring(eqIdx + 1).trim();
value = value.substring(0, filenameIdx) + String.format("filename*=UTF-8''%1$s; filename=\"%1$s\"", PrivateUtilities.URLEncode(filename, "UTF8"));
value = value.substring(0, filenameIdx) + String.format("filename*=UTF-8''%1$s; filename=\"%1$s\"", PrivateUtilities.URLEncode(filename, "UTF8").replace('+', ' '));

return value;
}
Expand Down
6 changes: 6 additions & 0 deletions java/src/test/java/com/genexus/webpanels/TestWebUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ public void TestContentDispositionHeaderEncoding6() {
doTest(contentDisposition, expectedContentDisposition);
}

@Test
public void TestContentDispositionHeaderEncoding7() {
String contentDisposition = "attachment; filename=My file.pdf";
String expectedContentDisposition = "attachment; filename*=UTF-8''My file.pdf; filename=\"My file.pdf\"";
doTest(contentDisposition, expectedContentDisposition);
}

private void doTest(String contentDisposition, String expectedContentDisposition) {
doTest(contentDisposition, expectedContentDisposition, HttpContextWeb.BROWSER_CHROME);
Expand Down