Preserve multiple incoming header values.

lib/src/request/mod.rs

@@ -15,3 +15,101 @@ pub use self::state::State;
 /// Type alias to retrieve [Flash](/rocket/response/struct.Flash.html) messages
 /// from a request.
 pub type FlashMessage = ::response::Flash<()>;
+
+#[cfg(test)]
+mod tests {
+    /// These tests are related to Issue#223
+    /// The way we were getting the headers from hyper
+    /// was causing a list to come back as a comma separated
+    /// list of entries.
+
+    use super::Request;
+    use super::super::http::hyper::header::Headers;
+    use hyper::method::Method;
+    use hyper::uri::RequestUri;
+    use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+    use std::collections::HashMap;
+
+    fn check_headers(test_headers: HashMap<String, Vec<String>>) {
+        let h_method: Method = Method::Get;
+        let h_uri: RequestUri = RequestUri::AbsolutePath("/test".to_string());
+        let h_addr: SocketAddr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8000);
+        let mut h_headers: Headers = Headers::new();
+
+        for (key, values) in &test_headers {
+            let raw_bytes: Vec<Vec<u8>> = values
+                .iter()
+                .map(|v| v.clone().into_bytes())
+                .collect();
+            h_headers.set_raw(key.clone(), raw_bytes);
+        }
+
+        let req = match Request::from_hyp(h_method, h_headers, h_uri, h_addr) {
+            Ok(req) => req,
+            Err(e) => panic!("Building Request failed: {:?}", e),
+        };
+
+        let r_headers = req.headers();
+
+        for (key, values) in &test_headers {
+            for (v1, v2) in values.iter().zip(r_headers.get(&key)) {
+                assert_eq!(v1, v2)
+            }
+        }
+    }
+
+    #[test]
+    fn test_single_header_single_entry() {
+        let mut test_headers = HashMap::new();
+        test_headers.insert("friends".to_string(), vec![
+            "alice".to_string(),
+        ]);
+        check_headers(test_headers);
+    }
+
+    #[test]
+    fn test_single_header_multiple_entries() {
+        let mut test_headers = HashMap::new();
+        test_headers.insert("friends".to_string(), vec![
+            "alice".to_string(),
+            "bob".to_string()
+        ]);
+        check_headers(test_headers);
+    }
+
+    #[test]
+    fn test_single_header_comma_entry() {
+        let mut test_headers = HashMap::new();
+        test_headers.insert("friends".to_string(), vec![
+            "alice".to_string(),
+            "bob, carol".to_string()
+        ]);
+        check_headers(test_headers);
+    }
+
+    #[test]
+    fn test_multiple_headers_single_entry() {
+        let mut test_headers = HashMap::new();
+        test_headers.insert("friends".to_string(), vec![
+            "alice".to_string(),
+        ]);
+        test_headers.insert("enemies".to_string(), vec![
+            "victor".to_string(),
+        ]);
+        check_headers(test_headers);
+    }
+
+    #[test]
+    fn test_multiple_headers_multiple_entries() {
+        let mut test_headers = HashMap::new();
+        test_headers.insert("friends".to_string(), vec![
+            "alice".to_string(),
+            "bob".to_string(),
+        ]);
+        test_headers.insert("enemies".to_string(), vec![
+            "david".to_string(),
+            "emily".to_string(),
+        ]);
+        check_headers(test_headers);
+    }
+}

lib/src/request/request.rs

@@ -1,6 +1,7 @@
 use std::cell::RefCell;
 use std::net::SocketAddr;
 use std::fmt;
+use std::str;
 
 use term_painter::Color::*;
 use term_painter::ToStyle;
@@ -480,8 +481,14 @@ impl<'r> Request<'r> {
 
         // Set the rest of the headers.
         for hyp in h_headers.iter() {
-            let header = Header::new(hyp.name().to_string(), hyp.value_string());
-            request.add_header(header);
+            if let Some(header_values) = h_headers.get_raw(hyp.name()) {
+                for value in header_values {
+                    let value_str = str::from_utf8(value)
+                        .map_err(|_| format!("Bad Header: {:?}", hyp))?;
+                    let header = Header::new(hyp.name().to_string(), value_str.to_string());
+                    request.add_header(header);
+                }
+            }
         }
 
         // Set the remote address.