mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-06-11 17:59:35 +00:00
Code Issues Projects Releases Wiki Activity

Send response to inform client of error (#515)

Browse source
This commit is contained in:
Douman 2018-09-21 07:24:10 +03:00 committed by GitHub
parent f40153fca4
commit 0dc96658f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.md
View file

@ -1,5 +1,11 @@
# Changes
## [0.7.9] - 2018-09-x
### Fixed
* HTTP1 decoding errors are reported to the client. #512
## [0.7.8] - 2018-09-17
### Added

4
src/payload.rs
View file

@ -1,6 +1,8 @@
//! Payload stream
use bytes::{Bytes, BytesMut};
use futures::task::{current as current_task, Task};
use futures::task::Task;
#[cfg(not(test))]
use futures::task::current as current_task;
use futures::{Async, Poll, Stream};
use std::cell::RefCell;
use std::cmp;

24
src/server/h1.rs
View file

@ -373,6 +373,16 @@ where
Ok(Async::NotReady)
}
fn push_response_entry(&mut self, status: StatusCode) {
self.tasks.push_back(Entry {
pipe: EntryPipe::Error(ServerError::err(
Version::HTTP_11,
status,
)),
flags: EntryFlags::empty(),
});
}
pub fn parse(&mut self) {
'outer: loop {
match self.decoder.decode(&mut self.buf, &self.settings) {
@ -439,13 +449,7 @@ where
}
// handler is not found
self.tasks.push_back(Entry {
pipe: EntryPipe::Error(ServerError::err(
Version::HTTP_11,
StatusCode::NOT_FOUND,
)),
flags: EntryFlags::empty(),
});
self.push_response_entry(StatusCode::NOT_FOUND);
}
Ok(Some(Message::Chunk(chunk))) => {
if let Some(ref mut payload) = self.payload {
@ -453,6 +457,7 @@ where
} else {
error!("Internal server error: unexpected payload chunk");
self.flags.insert(Flags::ERROR);
self.push_response_entry(StatusCode::INTERNAL_SERVER_ERROR);
break;
}
}
@ -462,6 +467,7 @@ where
} else {
error!("Internal server error: unexpected eof");
self.flags.insert(Flags::ERROR);
self.push_response_entry(StatusCode::INTERNAL_SERVER_ERROR);
break;
}
}
@ -482,6 +488,9 @@ where
};
payload.set_error(e);
}
//Malformed requests should be responded with 400
self.push_response_entry(StatusCode::BAD_REQUEST);
break;
}
}
@ -660,6 +669,7 @@ mod tests {
h1.poll_io();
h1.poll_io();
assert!(h1.flags.contains(Flags::ERROR));
assert_eq!(h1.tasks.len(), 1);
}
#[test]

2
tests/test_server.rs
View file

@ -11,6 +11,7 @@ extern crate rand;
extern crate tokio;
extern crate tokio_reactor;
extern crate tokio_tcp;
extern crate tokio_current_thread as current_thread;
use std::io::{Read, Write};
use std::sync::Arc;
@ -28,7 +29,6 @@ use h2::client as h2client;
use modhttp::Request;
use rand::distributions::Alphanumeric;
use rand::Rng;
use tokio::executor::current_thread;
use tokio::runtime::current_thread::Runtime;
use tokio_tcp::TcpStream;