mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-21 07:36:43 +00:00
Code Issues Projects Releases Wiki Activity

Avoid using Path to calculate URIs, because it doesn't do the right thing on Windows (#67)

Browse source 
Redirecting to index files now always uses `/` instead of backslash on windows.
This commit is contained in:
Christopher Armstrong 2018-02-07 15:31:09 -06:00 committed by GitHub
parent 884ea02f5c
commit 81e4fb9353
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/fs.rs
View file

@ -283,12 +283,18 @@ impl<S> Handler<S> for StaticFiles {
if path.is_dir() { if path.is_dir() {
if let Some(ref redir_index) = self.index { if let Some(ref redir_index) = self.index {
let mut base = Path::new(req.path()).join(relpath); // TODO: Don't redirect, just return the index content.
base.push(redir_index); // TODO: It'd be nice if there were a good usable URL manipulation library
let mut new_path: String = req.path().to_owned();
for el in relpath.iter() {
new_path.push_str(&el.to_string_lossy());
new_path.push('/');
}
new_path.push_str(redir_index);
Ok(FilesystemElement::Redirect( Ok(FilesystemElement::Redirect(
HTTPFound HTTPFound
.build() .build()
.header("LOCATION", base.to_string_lossy().as_ref()) .header::<_, &str>("LOCATION", &new_path)
.finish().unwrap())) .finish().unwrap()))
} else if self.show_index { } else if self.show_index {
Ok(FilesystemElement::Directory(Directory::new(self.directory.clone(), path))) Ok(FilesystemElement::Directory(Directory::new(self.directory.clone(), path)))
@ -340,7 +346,7 @@ mod tests {
} }
#[test] #[test]
fn test_redirec_to_index() { fn test_redirect_to_index() {
let mut st = StaticFiles::new(".", false).index_file("index.html"); let mut st = StaticFiles::new(".", false).index_file("index.html");
let mut req = HttpRequest::default(); let mut req = HttpRequest::default();
req.match_info_mut().add("tail", "guide"); req.match_info_mut().add("tail", "guide");
@ -348,5 +354,23 @@ mod tests {
let resp = st.handle(req).respond_to(HttpRequest::default()).unwrap(); let resp = st.handle(req).respond_to(HttpRequest::default()).unwrap();
assert_eq!(resp.status(), StatusCode::FOUND); assert_eq!(resp.status(), StatusCode::FOUND);
assert_eq!(resp.headers().get(header::LOCATION).unwrap(), "/guide/index.html"); assert_eq!(resp.headers().get(header::LOCATION).unwrap(), "/guide/index.html");
let mut req = HttpRequest::default();
req.match_info_mut().add("tail", "guide/");
let resp = st.handle(req).respond_to(HttpRequest::default()).unwrap();
assert_eq!(resp.status(), StatusCode::FOUND);
assert_eq!(resp.headers().get(header::LOCATION).unwrap(), "/guide/index.html");
}
#[test]
fn test_redirect_to_index_nested() {
let mut st = StaticFiles::new(".", false).index_file("Cargo.toml");
let mut req = HttpRequest::default();
req.match_info_mut().add("tail", "examples/basics");
let resp = st.handle(req).respond_to(HttpRequest::default()).unwrap();
assert_eq!(resp.status(), StatusCode::FOUND);
assert_eq!(resp.headers().get(header::LOCATION).unwrap(), "/examples/basics/Cargo.toml");
} }
} }