Skip to content

Commit

Permalink
fix: serve files with names containing newline char (#328)
Browse files Browse the repository at this point in the history
  • Loading branch information
sigoden committed Dec 23, 2023
1 parent 77f86a4 commit 006e03e
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
12 changes: 11 additions & 1 deletion src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 8 additions & 1 deletion tests/fixtures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
12 changes: 12 additions & 0 deletions tests/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()?;
Expand Down

0 comments on commit 006e03e

Please sign in to comment.