fix: serve files with names containing newline char (#328)
This commit is contained in:
parent
77f86a4c60
commit
006e03ed30
3 changed files with 31 additions and 2 deletions
|
@ -1547,13 +1547,23 @@ fn status_no_content(res: &mut Response) {
|
|||
|
||||
fn set_content_diposition(res: &mut Response, inline: bool, filename: &str) -> Result<()> {
|
||||
let kind = if inline { "inline" } else { "attachment" };
|
||||
let filename: String = filename
|
||||
.chars()
|
||||
.map(|ch| {
|
||||
if ch.is_ascii_control() && ch != '\t' {
|
||||
' '
|
||||
} else {
|
||||
ch
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
let value = if filename.is_ascii() {
|
||||
HeaderValue::from_str(&format!("{kind}; filename=\"{}\"", filename,))?
|
||||
} else {
|
||||
HeaderValue::from_str(&format!(
|
||||
"{kind}; filename=\"{}\"; filename*=UTF-8''{}",
|
||||
filename,
|
||||
encode_uri(filename),
|
||||
encode_uri(&filename),
|
||||
))?
|
||||
};
|
||||
res.headers_mut().insert(CONTENT_DISPOSITION, value);
|
||||
|
|
|
@ -16,7 +16,14 @@ pub const BIN_FILE: &str = "😀.bin";
|
|||
|
||||
/// File names for testing purpose
|
||||
#[allow(dead_code)]
|
||||
pub static FILES: &[&str] = &["test.txt", "test.html", "index.html", BIN_FILE];
|
||||
pub static FILES: &[&str] = &[
|
||||
"test.txt",
|
||||
"test.html",
|
||||
"index.html",
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
"file\n1.txt",
|
||||
BIN_FILE,
|
||||
];
|
||||
|
||||
/// Directory names for testing directory don't exist
|
||||
#[allow(dead_code)]
|
||||
|
|
|
@ -207,6 +207,18 @@ fn get_file_emoji_path(server: TestServer) -> Result<(), Error> {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
#[rstest]
|
||||
fn get_file_newline_path(server: TestServer) -> Result<(), Error> {
|
||||
let resp = reqwest::blocking::get(format!("{}file%0A1.txt", server.url()))?;
|
||||
assert_eq!(resp.status(), 200);
|
||||
assert_eq!(
|
||||
resp.headers().get("content-disposition").unwrap(),
|
||||
"inline; filename=\"file 1.txt\""
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[rstest]
|
||||
fn get_file_edit(server: TestServer) -> Result<(), Error> {
|
||||
let resp = fetch!(b"GET", format!("{}index.html?edit", server.url())).send()?;
|
||||
|
|
Loading…
Reference in a new issue