864d3e27a4
Request and Response are now visible from:
- hyper::{Request, Response}
- hyper::server::{Request, Response}
- hyper::client::{Request, Response}
They truly exist in the http module, but are re-exported to reduce the number of breaking changes.
request::new and response::new were renamed to ::from_wire to reduce confusion with Request::new
and Response::new. See issue #1126
Request now has an optional Body, because not all requests have bodies.
Use body_ref() to determine if a body exists.
Use body() to take the body, or construct one if no body exists.
Closes #1155
BREAKING CHANGE: Response::body() now consumes the response
526 lines
13 KiB
Rust
526 lines
13 KiB
Rust
#![deny(warnings)]
|
|
extern crate hyper;
|
|
extern crate futures;
|
|
extern crate spmc;
|
|
extern crate pretty_env_logger;
|
|
|
|
use futures::{Future, Stream};
|
|
use futures::sync::oneshot;
|
|
|
|
use std::net::{TcpStream, SocketAddr};
|
|
use std::io::{Read, Write};
|
|
use std::sync::mpsc;
|
|
use std::sync::{Arc, Mutex};
|
|
use std::thread;
|
|
use std::time::Duration;
|
|
|
|
use hyper::server::{Http, Request, Response, Service, NewService};
|
|
|
|
struct Serve {
|
|
addr: SocketAddr,
|
|
msg_rx: mpsc::Receiver<Msg>,
|
|
reply_tx: spmc::Sender<Reply>,
|
|
shutdown_signal: Option<oneshot::Sender<()>>,
|
|
thread: Option<thread::JoinHandle<()>>,
|
|
}
|
|
|
|
impl Serve {
|
|
fn addr(&self) -> &SocketAddr {
|
|
&self.addr
|
|
}
|
|
|
|
fn body(&self) -> Vec<u8> {
|
|
let mut buf = vec![];
|
|
while let Ok(Msg::Chunk(msg)) = self.msg_rx.try_recv() {
|
|
buf.extend(&msg);
|
|
}
|
|
buf
|
|
}
|
|
|
|
fn reply(&self) -> ReplyBuilder {
|
|
ReplyBuilder {
|
|
tx: &self.reply_tx
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ReplyBuilder<'a> {
|
|
tx: &'a spmc::Sender<Reply>,
|
|
}
|
|
|
|
impl<'a> ReplyBuilder<'a> {
|
|
fn status(self, status: hyper::StatusCode) -> Self {
|
|
self.tx.send(Reply::Status(status)).unwrap();
|
|
self
|
|
}
|
|
|
|
fn header<H: hyper::header::Header>(self, header: H) -> Self {
|
|
let mut headers = hyper::Headers::new();
|
|
headers.set(header);
|
|
self.tx.send(Reply::Headers(headers)).unwrap();
|
|
self
|
|
}
|
|
|
|
fn body<T: AsRef<[u8]>>(self, body: T) {
|
|
self.tx.send(Reply::Body(body.as_ref().into())).unwrap();
|
|
}
|
|
}
|
|
|
|
impl Drop for Serve {
|
|
fn drop(&mut self) {
|
|
drop(self.shutdown_signal.take());
|
|
self.thread.take().unwrap().join().unwrap();
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
struct TestService {
|
|
tx: Arc<Mutex<mpsc::Sender<Msg>>>,
|
|
reply: spmc::Receiver<Reply>,
|
|
_timeout: Option<Duration>,
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
enum Reply {
|
|
Status(hyper::StatusCode),
|
|
Headers(hyper::Headers),
|
|
Body(Vec<u8>),
|
|
}
|
|
|
|
enum Msg {
|
|
//Head(Request),
|
|
Chunk(Vec<u8>),
|
|
}
|
|
|
|
impl NewService for TestService {
|
|
type Request = Request;
|
|
type Response = Response;
|
|
type Error = hyper::Error;
|
|
|
|
type Instance = TestService;
|
|
|
|
fn new_service(&self) -> std::io::Result<TestService> {
|
|
Ok(self.clone())
|
|
}
|
|
|
|
|
|
}
|
|
|
|
impl Service for TestService {
|
|
type Request = Request;
|
|
type Response = Response;
|
|
type Error = hyper::Error;
|
|
type Future = Box<Future<Item=Response, Error=hyper::Error>>;
|
|
fn call(&self, req: Request) -> Self::Future {
|
|
let tx = self.tx.clone();
|
|
let replies = self.reply.clone();
|
|
req.body().for_each(move |chunk| {
|
|
tx.lock().unwrap().send(Msg::Chunk(chunk.to_vec())).unwrap();
|
|
Ok(())
|
|
}).map(move |_| {
|
|
let mut res = Response::new();
|
|
while let Ok(reply) = replies.try_recv() {
|
|
match reply {
|
|
Reply::Status(s) => {
|
|
res.set_status(s);
|
|
},
|
|
Reply::Headers(headers) => {
|
|
*res.headers_mut() = headers;
|
|
},
|
|
Reply::Body(body) => {
|
|
res.set_body(body);
|
|
},
|
|
}
|
|
}
|
|
res
|
|
}).boxed()
|
|
}
|
|
|
|
}
|
|
|
|
fn connect(addr: &SocketAddr) -> TcpStream {
|
|
let req = TcpStream::connect(addr).unwrap();
|
|
req.set_read_timeout(Some(Duration::from_secs(1))).unwrap();
|
|
req.set_write_timeout(Some(Duration::from_secs(1))).unwrap();
|
|
req
|
|
}
|
|
|
|
fn serve() -> Serve {
|
|
serve_with_options(Default::default())
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct ServeOptions {
|
|
keep_alive_disabled: bool,
|
|
timeout: Option<Duration>,
|
|
}
|
|
|
|
fn serve_with_options(options: ServeOptions) -> Serve {
|
|
let _ = pretty_env_logger::init();
|
|
|
|
let (addr_tx, addr_rx) = mpsc::channel();
|
|
let (msg_tx, msg_rx) = mpsc::channel();
|
|
let (reply_tx, reply_rx) = spmc::channel();
|
|
let (shutdown_tx, shutdown_rx) = oneshot::channel();
|
|
|
|
let addr = "127.0.0.1:0".parse().unwrap();
|
|
|
|
let keep_alive = !options.keep_alive_disabled;
|
|
let dur = options.timeout;
|
|
|
|
let thread_name = format!("test-server-{:?}", dur);
|
|
let thread = thread::Builder::new().name(thread_name).spawn(move || {
|
|
let srv = Http::new().keep_alive(keep_alive).bind(&addr, TestService {
|
|
tx: Arc::new(Mutex::new(msg_tx.clone())),
|
|
_timeout: dur,
|
|
reply: reply_rx,
|
|
}).unwrap();
|
|
addr_tx.send(srv.local_addr().unwrap()).unwrap();
|
|
srv.run_until(shutdown_rx.then(|_| Ok(()))).unwrap();
|
|
}).unwrap();
|
|
|
|
let addr = addr_rx.recv().unwrap();
|
|
|
|
Serve {
|
|
msg_rx: msg_rx,
|
|
reply_tx: reply_tx,
|
|
addr: addr,
|
|
shutdown_signal: Some(shutdown_tx),
|
|
thread: Some(thread),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn server_get_should_ignore_body() {
|
|
let server = serve();
|
|
|
|
let mut req = connect(server.addr());
|
|
// Connection: close = don't try to parse the body as a new request
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
I shouldn't be read.\r\n\
|
|
").unwrap();
|
|
req.read(&mut [0; 256]).unwrap();
|
|
|
|
assert_eq!(server.body(), b"");
|
|
}
|
|
|
|
#[test]
|
|
fn server_get_with_body() {
|
|
let server = serve();
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Content-Length: 19\r\n\
|
|
\r\n\
|
|
I'm a good request.\r\n\
|
|
").unwrap();
|
|
req.read(&mut [0; 256]).unwrap();
|
|
|
|
// note: doesn't include trailing \r\n, cause Content-Length wasn't 21
|
|
assert_eq!(server.body(), b"I'm a good request.");
|
|
}
|
|
|
|
#[test]
|
|
fn server_get_fixed_response() {
|
|
let foo_bar = b"foo bar baz";
|
|
let server = serve();
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::ContentLength(foo_bar.len() as u64))
|
|
.body(foo_bar);
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
").unwrap();
|
|
let mut body = String::new();
|
|
req.read_to_string(&mut body).unwrap();
|
|
let n = body.find("\r\n\r\n").unwrap() + 4;
|
|
|
|
assert_eq!(&body[n..], "foo bar baz");
|
|
}
|
|
|
|
#[test]
|
|
fn server_get_chunked_response() {
|
|
let foo_bar = b"foo bar baz";
|
|
let server = serve();
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::TransferEncoding::chunked())
|
|
.body(foo_bar);
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
").unwrap();
|
|
let mut body = String::new();
|
|
req.read_to_string(&mut body).unwrap();
|
|
let n = body.find("\r\n\r\n").unwrap() + 4;
|
|
|
|
assert_eq!(&body[n..], "B\r\nfoo bar baz\r\n0\r\n\r\n");
|
|
}
|
|
|
|
#[test]
|
|
fn server_get_chunked_response_with_ka() {
|
|
let foo_bar = b"foo bar baz";
|
|
let foo_bar_chunk = b"\r\nfoo bar baz\r\n0\r\n\r\n";
|
|
let server = serve();
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::TransferEncoding::chunked())
|
|
.body(foo_bar);
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: keep-alive\r\n\
|
|
\r\n\
|
|
").expect("writing 1");
|
|
|
|
let mut buf = [0; 1024 * 4];
|
|
let mut ntotal = 0;
|
|
loop {
|
|
let n = req.read(&mut buf[ntotal..]).expect("reading 1");
|
|
ntotal = ntotal + n;
|
|
assert!(ntotal < buf.len());
|
|
if &buf[ntotal - foo_bar_chunk.len()..ntotal] == foo_bar_chunk {
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
// try again!
|
|
|
|
let quux = b"zar quux";
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::ContentLength(quux.len() as u64))
|
|
.body(quux);
|
|
req.write_all(b"\
|
|
GET /quux HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
").expect("writing 2");
|
|
|
|
let mut buf = [0; 1024 * 8];
|
|
loop {
|
|
let n = req.read(&mut buf[..]).expect("reading 2");
|
|
assert!(n > 0, "n = {}", n);
|
|
if n < buf.len() && n > 0 {
|
|
if &buf[n - quux.len()..n] == quux {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
fn server_post_with_chunked_body() {
|
|
let server = serve();
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
POST / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Transfer-Encoding: chunked\r\n\
|
|
\r\n\
|
|
1\r\n\
|
|
q\r\n\
|
|
2\r\n\
|
|
we\r\n\
|
|
2\r\n\
|
|
rt\r\n\
|
|
0\r\n\
|
|
\r\n\
|
|
").unwrap();
|
|
req.read(&mut [0; 256]).unwrap();
|
|
|
|
assert_eq!(server.body(), b"qwert");
|
|
}
|
|
|
|
#[test]
|
|
fn server_empty_response_chunked() {
|
|
let server = serve();
|
|
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.body("");
|
|
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Content-Length: 0\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
").unwrap();
|
|
|
|
|
|
let mut response = String::new();
|
|
req.read_to_string(&mut response).unwrap();
|
|
|
|
assert!(response.contains("Transfer-Encoding: chunked\r\n"));
|
|
|
|
let mut lines = response.lines();
|
|
assert_eq!(lines.next(), Some("HTTP/1.1 200 OK"));
|
|
|
|
let mut lines = lines.skip_while(|line| !line.is_empty());
|
|
assert_eq!(lines.next(), Some(""));
|
|
// 0\r\n\r\n
|
|
assert_eq!(lines.next(), Some("0"));
|
|
assert_eq!(lines.next(), Some(""));
|
|
assert_eq!(lines.next(), None);
|
|
}
|
|
|
|
#[test]
|
|
fn server_empty_response_chunked_without_body_should_set_content_length() {
|
|
extern crate pretty_env_logger;
|
|
let _ = pretty_env_logger::init();
|
|
let server = serve();
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::TransferEncoding::chunked());
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
").unwrap();
|
|
|
|
let mut response = String::new();
|
|
req.read_to_string(&mut response).unwrap();
|
|
|
|
assert!(!response.contains("Transfer-Encoding: chunked\r\n"));
|
|
assert!(response.contains("Content-Length: 0\r\n"));
|
|
|
|
let mut lines = response.lines();
|
|
assert_eq!(lines.next(), Some("HTTP/1.1 200 OK"));
|
|
|
|
let mut lines = lines.skip_while(|line| !line.is_empty());
|
|
assert_eq!(lines.next(), Some(""));
|
|
assert_eq!(lines.next(), None);
|
|
}
|
|
|
|
#[test]
|
|
fn server_keep_alive() {
|
|
let foo_bar = b"foo bar baz";
|
|
let server = serve();
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::ContentLength(foo_bar.len() as u64))
|
|
.body(foo_bar);
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: keep-alive\r\n\
|
|
\r\n\
|
|
").expect("writing 1");
|
|
|
|
let mut buf = [0; 1024 * 8];
|
|
loop {
|
|
let n = req.read(&mut buf[..]).expect("reading 1");
|
|
if n < buf.len() {
|
|
if &buf[n - foo_bar.len()..n] == foo_bar {
|
|
break;
|
|
} else {
|
|
}
|
|
}
|
|
}
|
|
|
|
// try again!
|
|
|
|
let quux = b"zar quux";
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::ContentLength(quux.len() as u64))
|
|
.body(quux);
|
|
req.write_all(b"\
|
|
GET /quux HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
").expect("writing 2");
|
|
|
|
let mut buf = [0; 1024 * 8];
|
|
loop {
|
|
let n = req.read(&mut buf[..]).expect("reading 2");
|
|
assert!(n > 0, "n = {}", n);
|
|
if n < buf.len() {
|
|
if &buf[n - quux.len()..n] == quux {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_server_disable_keep_alive() {
|
|
let foo_bar = b"foo bar baz";
|
|
let server = serve_with_options(ServeOptions {
|
|
keep_alive_disabled: true,
|
|
.. Default::default()
|
|
});
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::ContentLength(foo_bar.len() as u64))
|
|
.body(foo_bar);
|
|
let mut req = connect(server.addr());
|
|
req.write_all(b"\
|
|
GET / HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: keep-alive\r\n\
|
|
\r\n\
|
|
").expect("writing 1");
|
|
|
|
let mut buf = [0; 1024 * 8];
|
|
loop {
|
|
let n = req.read(&mut buf[..]).expect("reading 1");
|
|
if n < buf.len() {
|
|
if &buf[n - foo_bar.len()..n] == foo_bar {
|
|
break;
|
|
} else {
|
|
}
|
|
}
|
|
}
|
|
|
|
// try again!
|
|
|
|
let quux = b"zar quux";
|
|
server.reply()
|
|
.status(hyper::Ok)
|
|
.header(hyper::header::ContentLength(quux.len() as u64))
|
|
.body(quux);
|
|
|
|
let _ = req.write_all(b"\
|
|
GET /quux HTTP/1.1\r\n\
|
|
Host: example.domain\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
");
|
|
|
|
// the write can possibly succeed, since it fills the kernel buffer on the first write
|
|
let mut buf = [0; 1024 * 8];
|
|
match req.read(&mut buf[..]) {
|
|
// Ok(0) means EOF, so a proper shutdown
|
|
// Err(_) could mean ConnReset or something, also fine
|
|
Ok(0) |
|
|
Err(_) => {}
|
|
Ok(n) => {
|
|
panic!("read {} bytes on a disabled keep-alive socket", n);
|
|
}
|
|
}
|
|
}
|