iron/hyper header hack, revert once Hyper updates to 0.9.x

Signed-off-by: Dave Parfitt <[email protected]>

Pull request: #526
Approved by: fnichol

components/depot-core/src/data_object.rs

@@ -248,4 +248,3 @@ impl AsRef<OriginKeyIdent> for OriginKeyIdent {
         self
     }
 }
-

components/depot-core/src/lib.rs

@@ -5,6 +5,7 @@
 // the Software until such time that the Software is made available under an
 // open source license such as the Apache 2.0 License.
 
+
 extern crate habitat_core as hcore;
 #[macro_use]
 extern crate hyper;
@@ -13,15 +14,7 @@ extern crate rustc_serialize;
 
 pub mod data_object;
 
-use hyper::header::{Headers, ContentDisposition, DispositionType, DispositionParam, Charset};
-
 header! { (XFileName, "X-Filename") => [String] }
 header! { (ETag, "ETag") => [String] }
 
-/// convenience function for setting Content-Disposition
-pub fn set_disposition(headers: &mut Headers, filename: String, charset: Charset) -> () {
-    headers.set(ContentDisposition {
-        disposition: DispositionType::Attachment,
-        parameters: vec![DispositionParam::Filename( charset, None, filename.into_bytes())],
-    });
-}
+

components/depot/src/server.rs

@@ -10,7 +10,6 @@ use std::io::{Read, Write, BufWriter};
 use std::path::PathBuf;
 
 use dbcache;
-use depot_core::{ETag, XFileName, set_disposition};
 use depot_core::data_object::{self, DataObject};
 use iron::prelude::*;
 use iron::{status, headers, AfterMiddleware};
@@ -20,6 +19,7 @@ use router::{Params, Router};
 use rustc_serialize::json;
 use urlencoded::UrlEncodedQuery;
 
+
 use super::Depot;
 use config::Config;
 use error::{Error, Result};
@@ -188,13 +188,17 @@ fn download_origin_key(depot: &Depot, req: &mut Request) -> IronResult<Response>
 
     let xfilename = origin_keyfile.file_name().unwrap().to_string_lossy().into_owned();
     let mut response = Response::with((status::Ok, origin_keyfile));
-    response.headers.set(XFileName(xfilename.clone()));
-    set_disposition(&mut response.headers,
-                    xfilename,
-                    headers::Charset::Ext("utf-8".to_string()));
+    // use set_raw because we're having problems with Iron's Hyper 0.8.x
+    // and the newer Hyper 0.9.4. TODO: change back to set() once
+    // Iron updates to Hyper 0.9.x.
+    response.headers.set_raw("X-Filename", vec![xfilename.clone().into_bytes()]);
+    response.headers.set_raw("content-disposition",
+                             vec![format!("attachment; filename=\"{}\"", xfilename.clone())
+                                      .into_bytes()]);
     Ok(response)
 }
 
+
 fn download_latest_origin_key(depot: &Depot, req: &mut Request) -> IronResult<Response> {
     debug!("Download latest origin key {:?}", req);
     let params = req.extensions.get::<Router>().unwrap();
@@ -223,10 +227,13 @@ fn download_latest_origin_key(depot: &Depot, req: &mut Request) -> IronResult<Re
 
     let xfilename = origin_keyfile.file_name().unwrap().to_string_lossy().into_owned();
     let mut response = Response::with((status::Ok, origin_keyfile));
-    response.headers.set(XFileName(xfilename.clone()));
-    set_disposition(&mut response.headers,
-                    xfilename,
-                    headers::Charset::Ext("utf-8".to_string()));
+    // use set_raw because we're having problems with Iron's Hyper 0.8.x
+    // and the newer Hyper 0.9.4. TODO: change back to set() once
+    // Iron updates to Hyper 0.9.x.
+    response.headers.set_raw("X-Filename", vec![xfilename.clone().into_bytes()]);
+    response.headers.set_raw("content-disposition",
+                             vec![format!("attachment; filename=\"{}\"", xfilename.clone())
+                                      .into_bytes()]);
     Ok(response)
 }
 
@@ -241,11 +248,16 @@ fn download_package(depot: &Depot, req: &mut Request) -> IronResult<Response> {
                 match fs::metadata(&archive.path) {
                     Ok(_) => {
                         let mut response = Response::with((status::Ok, archive.path.clone()));
-                        response.headers.set(XFileName(archive.file_name()));
-
-                        set_disposition(&mut response.headers,
-                                        archive.file_name(),
-                                        headers::Charset::Ext("utf-8".to_string()));
+                        // use set_raw because we're having problems with Iron's Hyper 0.8.x
+                        // and the newer Hyper 0.9.4. TODO: change back to set() once
+                        // Iron updates to Hyper 0.9.x.
+
+                        response.headers.set_raw("X-Filename",
+                                                 vec![archive.file_name().clone().into_bytes()]);
+                        response.headers.set_raw("content-disposition",
+                                                 vec![format!("attachment; filename=\"{}\"",
+                                                              archive.file_name().clone())
+                                                          .into_bytes()]);
                         Ok(response)
                     }
                     Err(_) => Ok(Response::with(status::NotFound)),
@@ -409,10 +421,14 @@ fn show_package(depot: &Depot, req: &mut Request) -> IronResult<Response> {
     }
 }
 
+
 fn render_package(pkg: &data_object::Package) -> IronResult<Response> {
     let body = json::encode(pkg).unwrap();
     let mut response = Response::with((status::Ok, body));
-    response.headers.set(ETag(pkg.checksum.clone()));
+    // use set_raw because we're having problems with Iron's Hyper 0.8.x
+    // and the newer Hyper 0.9.4. TODO: change back to set() once
+    // Iron updates to Hyper 0.9.x.
+    response.headers.set_raw("ETag", vec![pkg.checksum.clone().into_bytes()]);
     Ok(response)
 }