actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-30 18:44:35 +01:00
Code Issues Releases Wiki Activity

allow to use NamedFile with any request method

Browse Source
This commit is contained in:
Nikolay Kim 2018-03-15 16:55:22 -07:00
parent 0f064db31d
commit 73bf2068aa
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/fs.rs
View File

@ -36,6 +36,7 @@ pub struct NamedFile {
md: Metadata, md: Metadata,
modified: Option<SystemTime>, modified: Option<SystemTime>,
cpu_pool: Option<CpuPool>, cpu_pool: Option<CpuPool>,
only_get: bool,
} }
impl NamedFile { impl NamedFile {
@ -54,7 +55,14 @@ impl NamedFile {
let path = path.as_ref().to_path_buf(); let path = path.as_ref().to_path_buf();
let modified = md.modified().ok(); let modified = md.modified().ok();
let cpu_pool = None; let cpu_pool = None;
Ok(NamedFile{path, file, md, modified, cpu_pool}) Ok(NamedFile{path, file, md, modified, cpu_pool, only_get: false})
}
/// Allow only GET and HEAD methods
#[inline]
pub fn only_get(mut self) -> Self {
self.only_get = true;
self
} }
/// Returns reference to the underlying `File` object. /// Returns reference to the underlying `File` object.
@ -168,7 +176,7 @@ impl Responder for NamedFile {
type Error = io::Error; type Error = io::Error;
fn respond_to(self, req: HttpRequest) -> Result<HttpResponse, io::Error> { fn respond_to(self, req: HttpRequest) -> Result<HttpResponse, io::Error> {
if *req.method() != Method::GET && *req.method() != Method::HEAD { if self.only_get && *req.method() != Method::GET && *req.method() != Method::HEAD {
return Ok(HttpMethodNotAllowed.build() return Ok(HttpMethodNotAllowed.build()
.header(header::http::CONTENT_TYPE, "text/plain") .header(header::http::CONTENT_TYPE, "text/plain")
.header(header::http::ALLOW, "GET, HEAD") .header(header::http::ALLOW, "GET, HEAD")
@ -215,7 +223,9 @@ impl Responder for NamedFile {
return Ok(resp.status(StatusCode::NOT_MODIFIED).finish().unwrap()) return Ok(resp.status(StatusCode::NOT_MODIFIED).finish().unwrap())
} }
if *req.method() == Method::GET { if *req.method() == Method::HEAD {
Ok(resp.finish().unwrap())
} else {
let reader = ChunkedReadFile { let reader = ChunkedReadFile {
size: self.md.len(), size: self.md.len(),
offset: 0, offset: 0,
@ -224,8 +234,6 @@ impl Responder for NamedFile {
fut: None, fut: None,
}; };
Ok(resp.streaming(reader).unwrap()) Ok(resp.streaming(reader).unwrap())
} else {
Ok(resp.finish().unwrap())
} }
} }
} }
@ -487,7 +495,8 @@ impl<S> Handler<S> for StaticFiles {
} }
} else { } else {
Ok(FilesystemElement::File( Ok(FilesystemElement::File(
NamedFile::open(path)?.set_cpu_pool(self.cpu_pool.clone()))) NamedFile::open(path)?
.set_cpu_pool(self.cpu_pool.clone()).only_get()))
} }
} }
} }
@ -517,10 +526,18 @@ mod tests {
let req = TestRequest::default().method(Method::POST).finish(); let req = TestRequest::default().method(Method::POST).finish();
let file = NamedFile::open("Cargo.toml").unwrap(); let file = NamedFile::open("Cargo.toml").unwrap();
let resp = file.respond_to(req).unwrap(); let resp = file.only_get().respond_to(req).unwrap();
assert_eq!(resp.status(), StatusCode::METHOD_NOT_ALLOWED); assert_eq!(resp.status(), StatusCode::METHOD_NOT_ALLOWED);
} }
#[test]
fn test_named_file_any_method() {
let req = TestRequest::default().method(Method::POST).finish();
let file = NamedFile::open("Cargo.toml").unwrap();
let resp = file.respond_to(req).unwrap();
assert_eq!(resp.status(), StatusCode::OK);
}
#[test] #[test]
fn test_static_files() { fn test_static_files() {
let mut st = StaticFiles::new(".", true); let mut st = StaticFiles::new(".", true);