reader tests

src/decode.rs

@@ -133,7 +133,7 @@ impl Decoder {
 macro_rules! byte (
     ($rdr:ident) => ({
         if $rdr.len() > 0 {
-            let b = $rdr[1];
+            let b = $rdr[0];
             $rdr.split_to(1);
             b
         } else {

src/httpmessage.rs

@@ -117,10 +117,11 @@ impl HttpRequest {
     pub fn keep_alive(&self) -> bool {
         if let Some(conn) = self.headers.get(header::CONNECTION) {
             if let Ok(conn) = conn.to_str() {
-                if self.version == Version::HTTP_10 && !conn.contains("keep-alive") {
+                if self.version == Version::HTTP_10 && conn.contains("keep-alive") {
-                    false
+                    true
                 } else {
-                    self.version == Version::HTTP_11 && conn.contains("close")
+                    self.version == Version::HTTP_11 &&
+                        !(conn.contains("close") || conn.contains("upgrade"))
                 }
             } else {
                 false
@@ -130,23 +131,22 @@ impl HttpRequest {
         }
     }
 
-    pub(crate) fn is_upgrade(&self) -> bool {
+    pub(crate) fn upgrade(&self) -> bool {
         if let Some(conn) = self.headers().get(header::CONNECTION) {
             if let Ok(s) = conn.to_str() {
                 return s.to_lowercase().contains("upgrade")
             }
         }
-        false
+        self.method == Method::CONNECT
     }
 
-    pub fn is_chunked(&self) -> Result<bool, io::Error> {
+    pub fn chunked(&self) -> Result<bool, io::Error> {
         if let Some(encodings) = self.headers().get(header::TRANSFER_ENCODING) {
             if let Ok(s) = encodings.to_str() {
-                return Ok(s.to_lowercase().contains("chunked"))
+                Ok(s.to_lowercase().contains("chunked"))
             } else {
                 Err(io::Error::new(
-                    io::ErrorKind::Other,
+                    io::ErrorKind::Other, "Can not read transfer-encoding header"))
-                    "Request with transfer-encoding header, but not chunked"))
             }
         } else {
             Ok(false)

src/payload.rs

@@ -3,7 +3,7 @@ use std::cell::RefCell;
 use std::convert::From;
 use std::collections::VecDeque;
 use std::io::Error as IoError;
-use bytes::Bytes;
+use bytes::{Bytes, BytesMut};
 use futures::{Async, Poll, Stream};
 use futures::task::{Task, current as current_task};
 
@@ -70,6 +70,11 @@ impl Payload {
         self.inner.borrow_mut().readany()
     }
 
+    #[doc(hidden)]
+    pub fn readall(&mut self) -> Option<Bytes> {
+        self.inner.borrow_mut().readall()
+    }
+
     /// Put unused data back to payload
     pub fn unread_data(&mut self, data: Bytes) {
         self.inner.borrow_mut().unread_data(data);
@@ -187,7 +192,7 @@ impl Inner {
     }
 
     fn eof(&self) -> bool {
-        self.eof
+        self.items.is_empty() && self.eof
     }
 
     fn len(&self) -> usize {
@@ -208,6 +213,21 @@ impl Inner {
         }
     }
 
+    #[doc(hidden)]
+    pub fn readall(&mut self) -> Option<Bytes> {
+        let len = self.items.iter().fold(0, |cur, item| cur + item.len());
+        if len > 0 {
+            let mut buf = BytesMut::with_capacity(len);
+            for item in &self.items {
+                buf.extend(item);
+            }
+            self.items = VecDeque::new();
+            Some(buf.take().freeze())
+        } else {
+            None
+        }
+    }
+
     pub fn unread_data(&mut self, data: Bytes) {
         self.len += data.len();
         self.items.push_front(data)

src/reader.rs

@@ -16,6 +16,12 @@ const MAX_HEADERS: usize = 100;
 const INIT_BUFFER_SIZE: usize = 8192;
 const MAX_BUFFER_SIZE: usize = 131_072;
 
+enum Decoding {
+    Paused,
+    Ready,
+    NotReady,
+}
+
 struct PayloadInfo {
     tx: PayloadSender,
     decoder: Decoder,
@@ -26,12 +32,7 @@ pub(crate) struct Reader {
     payload: Option<PayloadInfo>,
 }
 
-enum Decoding {
+#[derive(Debug)]
-    Paused,
-    Ready,
-    NotReady,
-}
-
 pub(crate) enum ReaderError {
     Payload,
     Error(ParseError),
@@ -45,19 +46,6 @@ impl Reader {
         }
     }
 
-    #[allow(dead_code)]
-    pub fn consume_leading_lines(&mut self) {
-        if !self.read_buf.is_empty() {
-            let mut i = 0;
-            while i < self.read_buf.len() {
-                match self.read_buf[i] {
-                    b'\r' | b'\n' => i += 1,
-                    _ => break,
-                }
-            }            self.read_buf.split_to(i);
-        }
-    }
-
     fn decode(&mut self) -> std::result::Result<Decoding, ReaderError>
     {
         if let Some(ref mut payload) = self.payload {
@@ -101,7 +89,7 @@ impl Reader {
                             if let Some(ref mut payload) = self.payload {
                                 payload.tx.set_error(PayloadError::Incomplete);
                             }
-                            // http channel should deal with payload errors
+                            // http channel should not deal with payload errors
                             return Err(ReaderError::Payload)
                         }
                         Ok(Async::Ready(_)) => {
@@ -112,7 +100,7 @@ impl Reader {
                             if let Some(ref mut payload) = self.payload {
                                 payload.tx.set_error(err.into());
                             }
-                            // http channel should deal with payload errors
+                            // http channel should not deal with payload errors
                             return Err(ReaderError::Payload)
                         }
                     }
@@ -121,7 +109,7 @@ impl Reader {
         }
 
         loop {
-            match try!(parse(&mut self.read_buf).map_err(ReaderError::Error)) {
+            match try!(Reader::parse_message(&mut self.read_buf).map_err(ReaderError::Error)) {
                 Some((msg, decoder)) => {
                     let payload = if let Some(decoder) = decoder {
                         let (tx, rx) = Payload::new(false);
@@ -215,11 +203,10 @@ impl Reader {
             Ok(Async::Ready(n))
         }
     }
-}
 
-
+    fn parse_message(buf: &mut BytesMut)
-pub fn parse(buf: &mut BytesMut) -> Result<Option<(HttpRequest, Option<Decoder>)>, ParseError>
+                     -> Result<Option<(HttpRequest, Option<Decoder>)>, ParseError>
-{
+    {
         if buf.is_empty() {
             return Ok(None);
         }
@@ -271,7 +258,7 @@ pub fn parse(buf: &mut BytesMut) -> Result<Option<(HttpRequest, Option<Decoder>)
                 if let Ok(value) = HeaderValue::try_from(
                     slice.slice(header.value.0, header.value.1))
                 {
-                headers.insert(name, value);
+                    headers.append(name, value);
                 } else {
                     return Err(ParseError::Header)
                 }
@@ -281,14 +268,14 @@ pub fn parse(buf: &mut BytesMut) -> Result<Option<(HttpRequest, Option<Decoder>)
         }
 
         let msg = HttpRequest::new(method, uri, version, headers);
-    let upgrade = msg.is_upgrade() || *msg.method() == Method::CONNECT;
-    let chunked = msg.is_chunked()?;
 
-    let decoder = if upgrade {
+        let decoder = if msg.upgrade() {
             Some(Decoder::eof())
-    }
+        } else {
+            let chunked = msg.chunked()?;
+
             // Content-Length
-    else if let Some(len) = msg.headers().get(header::CONTENT_LENGTH) {
+            if let Some(len) = msg.headers().get(header::CONTENT_LENGTH) {
                 if chunked {
                     return Err(ParseError::Header)
                 }
@@ -307,8 +294,10 @@ pub fn parse(buf: &mut BytesMut) -> Result<Option<(HttpRequest, Option<Decoder>)
                 Some(Decoder::chunked())
             } else {
                 None
+            }
         };
         Ok(Some((msg, decoder)))
+    }
 }
 
 #[derive(Clone, Copy)]
@@ -331,3 +320,490 @@ fn record_header_indices(bytes: &[u8],
         indices.value = (value_start, value_end);
     }
 }
+
+
+#[cfg(test)]
+mod tests {
+    use std::{io, cmp};
+    use bytes::{Bytes, BytesMut};
+    use futures::{Async};
+    use tokio_io::AsyncRead;
+    use http::{Version, Method};
+    use super::{Reader, ReaderError};
+
+    struct Buffer {
+        buf: Bytes,
+        err: Option<io::Error>,
+    }
+
+    impl Buffer {
+        fn new(data: &'static str) -> Buffer {
+            Buffer {
+                buf: Bytes::from(data),
+                err: None,
+            }
+        }
+        fn feed_data(&mut self, data: &'static str) {
+            let mut b = BytesMut::from(self.buf.as_ref());
+            b.extend(data.as_bytes());
+            self.buf = b.take().freeze();
+        }
+    }
+    
+    impl AsyncRead for Buffer {}
+    impl io::Read for Buffer {
+        fn read(&mut self, dst: &mut [u8]) -> Result<usize, io::Error> {
+            if self.buf.is_empty() {
+                if self.err.is_some() {
+                    Err(self.err.take().unwrap())
+                } else {
+                    Err(io::Error::new(io::ErrorKind::WouldBlock, ""))
+                }
+            } else {
+                let size = cmp::min(self.buf.len(), dst.len());
+                let b = self.buf.split_to(size);
+                dst[..size].copy_from_slice(&b);
+                Ok(size)
+            }
+        }
+    }
+
+    macro_rules! not_ready {
+        ($e:expr) => (match $e {
+            Ok(Async::NotReady) => (),
+            Err(err) => panic!("Unexpected error: {:?}", err),
+            _ => panic!("Should not be ready"),
+        })
+    }
+
+    macro_rules! parse_ready {
+        ($e:expr) => (
+            match Reader::new().parse($e) {
+                Ok(Async::Ready((req, payload))) => (req, payload),
+                Ok(_) => panic!("Eof during parsing http request"),
+                Err(err) => panic!("Error during parsing http request: {:?}", err),
+            }
+        )
+    }
+
+    macro_rules! reader_parse_ready {
+        ($e:expr) => (
+            match $e {
+                Ok(Async::Ready((req, payload))) => (req, payload),
+                Ok(_) => panic!("Eof during parsing http request"),
+                Err(err) => panic!("Error during parsing http request: {:?}", err),
+            }
+        )
+    }
+
+    macro_rules! expect_parse_err {
+        ($e:expr) => (match Reader::new().parse($e) {
+            Err(err) => match err {
+                ReaderError::Error(_) => (),
+                _ => panic!("Parse error expected"),
+            },
+            _ => panic!("Error expected"),
+        })
+    }
+
+    #[test]
+    fn test_parse() {
+        let mut buf = Buffer::new("GET /test HTTP/1.1\r\n\r\n");
+
+        let mut reader = Reader::new();
+        match reader.parse(&mut buf) {
+            Ok(Async::Ready((req, payload))) => {
+                assert_eq!(req.version(), Version::HTTP_11);
+                assert_eq!(*req.method(), Method::GET);
+                assert_eq!(req.path(), "/test");
+                assert!(payload.eof());
+            }
+            Ok(_) | Err(_) => panic!("Error during parsing http request"),
+        }
+    }
+
+    #[test]
+    fn test_parse_partial() {
+        let mut buf = Buffer::new("PUT /test HTTP/1");
+
+        let mut reader = Reader::new();
+        match reader.parse(&mut buf) {
+            Ok(Async::NotReady) => (),
+            _ => panic!("Error"),
+        }
+
+        buf.feed_data(".1\r\n\r\n");
+        match reader.parse(&mut buf) {
+            Ok(Async::Ready((req, payload))) => {
+                assert_eq!(req.version(), Version::HTTP_11);
+                assert_eq!(*req.method(), Method::PUT);
+                assert_eq!(req.path(), "/test");
+                assert!(payload.eof());
+            }
+            Ok(_) | Err(_) => panic!("Error during parsing http request"),
+        }
+    }
+
+    #[test]
+    fn test_parse_post() {
+        let mut buf = Buffer::new("POST /test2 HTTP/1.0\r\n\r\n");
+
+        let mut reader = Reader::new();
+        match reader.parse(&mut buf) {
+            Ok(Async::Ready((req, payload))) => {
+                assert_eq!(req.version(), Version::HTTP_10);
+                assert_eq!(*req.method(), Method::POST);
+                assert_eq!(req.path(), "/test2");
+                assert!(payload.eof());
+            }
+            Ok(_) | Err(_) => panic!("Error during parsing http request"),
+        }
+    }
+
+    #[test]
+    fn test_parse_body() {
+        let mut buf = Buffer::new("GET /test HTTP/1.1\r\nContent-Length: 4\r\n\r\nbody");
+
+        let mut reader = Reader::new();
+        match reader.parse(&mut buf) {
+            Ok(Async::Ready((req, mut payload))) => {
+                assert_eq!(req.version(), Version::HTTP_11);
+                assert_eq!(*req.method(), Method::GET);
+                assert_eq!(req.path(), "/test");
+                assert_eq!(payload.readall().unwrap().as_ref(), b"body");
+            }
+            Ok(_) | Err(_) => panic!("Error during parsing http request"),
+        }
+    }
+
+    #[test]
+    fn test_parse_body_crlf() {
+        let mut buf = Buffer::new(
+            "\r\nGET /test HTTP/1.1\r\nContent-Length: 4\r\n\r\nbody");
+
+        let mut reader = Reader::new();
+        match reader.parse(&mut buf) {
+            Ok(Async::Ready((req, mut payload))) => {
+                assert_eq!(req.version(), Version::HTTP_11);
+                assert_eq!(*req.method(), Method::GET);
+                assert_eq!(req.path(), "/test");
+                assert_eq!(payload.readall().unwrap().as_ref(), b"body");
+            }
+            Ok(_) | Err(_) => panic!("Error during parsing http request"),
+        }
+    }
+
+    #[test]
+    fn test_parse_partial_eof() {
+        let mut buf = Buffer::new("GET /test HTTP/1.1\r\n");
+
+        let mut reader = Reader::new();
+        not_ready!{ reader.parse(&mut buf) }
+
+        buf.feed_data("\r\n");
+        match reader.parse(&mut buf) {
+            Ok(Async::Ready((req, payload))) => {
+                assert_eq!(req.version(), Version::HTTP_11);
+                assert_eq!(*req.method(), Method::GET);
+                assert_eq!(req.path(), "/test");
+                assert!(payload.eof());
+            }
+            Ok(_) | Err(_) => panic!("Error during parsing http request"),
+        }
+    }
+
+    #[test]
+    fn test_headers_split_field() {
+        let mut buf = Buffer::new("GET /test HTTP/1.1\r\n");
+
+        let mut reader = Reader::new();
+        not_ready!{ reader.parse(&mut buf) }
+
+        buf.feed_data("t");
+        not_ready!{ reader.parse(&mut buf) }
+
+        buf.feed_data("es");
+        not_ready!{ reader.parse(&mut buf) }
+
+        buf.feed_data("t: value\r\n\r\n");
+        match reader.parse(&mut buf) {
+            Ok(Async::Ready((req, payload))) => {
+                assert_eq!(req.version(), Version::HTTP_11);
+                assert_eq!(*req.method(), Method::GET);
+                assert_eq!(req.path(), "/test");
+                assert_eq!(req.headers().get("test").unwrap().as_bytes(), b"value");
+                assert!(payload.eof());
+            }
+            Ok(_) | Err(_) => panic!("Error during parsing http request"),
+        }
+    }
+
+    #[test]
+    fn test_headers_multi_value() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             Set-Cookie: c1=cookie1\r\n\
+             Set-Cookie: c2=cookie2\r\n\r\n");
+
+        let mut reader = Reader::new();
+        match reader.parse(&mut buf) {
+            Ok(Async::Ready((req, _))) => {
+                let val: Vec<_> = req.headers().get_all("Set-Cookie")
+                    .iter().map(|v| v.to_str().unwrap().to_owned()).collect();
+                assert_eq!(val[0], "c1=cookie1");
+                assert_eq!(val[1], "c2=cookie2");
+            }
+            Ok(_) | Err(_) => panic!("Error during parsing http request"),
+        }
+    }
+
+    #[test]
+    fn test_conn_default_1_0() {
+        let mut buf = Buffer::new("GET /test HTTP/1.0\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert!(!req.keep_alive());
+    }
+
+    #[test]
+    fn test_conn_default_1_1() {
+        let mut buf = Buffer::new("GET /test HTTP/1.1\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert!(req.keep_alive());
+    }
+
+    #[test]
+    fn test_conn_close() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             connection: close\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert!(!req.keep_alive());
+    }
+
+    #[test]
+    fn test_conn_close_1_0() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.0\r\n\
+             connection: close\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert!(!req.keep_alive());
+    }
+
+    #[test]
+    fn test_conn_keep_alive_1_0() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.0\r\n\
+             connection: keep-alive\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert!(req.keep_alive());
+    }
+
+    #[test]
+    fn test_conn_keep_alive_1_1() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             connection: keep-alive\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert!(req.keep_alive());
+    }
+
+    #[test]
+    fn test_conn_other_1_0() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.0\r\n\
+             connection: other\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert!(!req.keep_alive());
+    }
+
+    #[test]
+    fn test_conn_other_1_1() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             connection: other\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert!(req.keep_alive());
+    }
+
+    #[test]
+    fn test_conn_upgrade() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             connection: upgrade\r\n\r\n");
+        let (req, payload) = parse_ready!(&mut buf);
+
+        assert!(!payload.eof());
+        assert!(req.upgrade());
+    }
+
+    #[test]
+    fn test_conn_upgrade_connect_method() {
+        let mut buf = Buffer::new(
+            "CONNECT /test HTTP/1.1\r\n\
+             content-length: 0\r\n\r\n");
+        let (req, payload) = parse_ready!(&mut buf);
+
+        assert!(req.upgrade());
+        assert!(!payload.eof());
+    }
+
+    #[test]
+    fn test_request_chunked() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             transfer-encoding: chunked\r\n\r\n");
+        let (req, payload) = parse_ready!(&mut buf);
+
+        assert!(!payload.eof());
+        if let Ok(val) = req.chunked() {
+            assert!(val);
+        } else {
+            panic!("Error");
+        }
+
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             transfer-encoding: chnked\r\n\r\n");
+        let (req, payload) = parse_ready!(&mut buf);
+
+        assert!(payload.eof());
+        if let Ok(val) = req.chunked() {
+            assert!(!val);
+        } else {
+            panic!("Error");
+        }
+    }
+
+    #[test]
+    fn test_headers_content_length_err_1() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             content-length: line\r\n\r\n");
+
+        expect_parse_err!(&mut buf)
+    }
+
+    #[test]
+    fn test_headers_content_length_err_2() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             content-length: -1\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
+    }
+
+    #[test]
+    fn test_invalid_header() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             test line\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
+    }
+
+    #[test]
+    fn test_invalid_name() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             test[]: line\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
+    }
+
+    #[test]
+    fn test_http_request_bad_status_line() {
+        let mut buf = Buffer::new("getpath \r\n\r\n");
+        expect_parse_err!(&mut buf);
+    }
+
+    #[test]
+    fn test_http_request_upgrade() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             connection: upgrade\r\n\
+             upgrade: websocket\r\n\r\n\
+             some raw data");
+        let (req, mut payload) = parse_ready!(&mut buf);
+        assert!(!req.keep_alive());
+        assert!(req.upgrade());
+        assert_eq!(payload.readall().unwrap().as_ref(), b"some raw data");
+    }
+
+    #[test]
+    fn test_http_request_parser_utf8() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             x-test: тест\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert_eq!(req.headers().get("x-test").unwrap().as_bytes(),
+                   "тест".as_bytes());
+    }
+
+    #[test]
+    fn test_http_request_parser_two_slashes() {
+        let mut buf = Buffer::new(
+            "GET //path HTTP/1.1\r\n\r\n");
+        let (req, _) = parse_ready!(&mut buf);
+
+        assert_eq!(req.path(), "//path");
+    }
+
+    #[test]
+    fn test_http_request_parser_bad_method() {
+        let mut buf = Buffer::new(
+            "!12%()+=~$ /get HTTP/1.1\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
+    }
+
+    #[test]
+    fn test_http_request_parser_bad_version() {
+        let mut buf = Buffer::new("GET //get HT/11\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
+    }
+
+    #[test]
+    fn test_http_request_chunked_payload() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             transfer-encoding: chunked\r\n\r\n");
+
+        let mut reader = Reader::new();
+        let (req, mut payload) = reader_parse_ready!(reader.parse(&mut buf));
+        assert!(req.chunked().unwrap());
+        assert!(!payload.eof());
+
+        buf.feed_data("4\r\ndata\r\n4\r\nline\r\n0\r\n\r\n");
+        not_ready!(reader.parse(&mut buf));
+        assert!(!payload.eof());
+        assert_eq!(payload.readall().unwrap().as_ref(), b"dataline");
+        assert!(payload.eof());
+    }
+
+    /*#[test]
+    #[should_panic]
+    fn test_parse_multiline() {
+        let mut buf = Buffer::new(
+            "GET /test HTTP/1.1\r\n\
+             test: line\r\n \
+               continue\r\n\
+             test2: data\r\n\
+             \r\n", false);
+
+        let mut reader = Reader::new();
+        match reader.parse(&mut buf) {
+            Ok(res) => (),
+            Err(err) => panic!("{:?}", err),
+        }
+    }*/
+}

src/ws.rs

@@ -130,7 +130,7 @@ pub fn handshake(req: &HttpRequest) -> Result<HttpResponse, HttpResponse> {
     }
 
     // Upgrade connection
-    if !req.is_upgrade() {
+    if !req.upgrade() {
         return Err(HTTPBadRequest.with_reason("No CONNECTION upgrade"))
     }