Update to reqwest 0.10

Fixes #79.

Author: ramosbugs

Cargo.toml

@@ -19,7 +19,7 @@ default = ["reqwest-09"]
 futures-01 = ["futures-0-1"]
 futures-03 = ["futures-0-3", "async-trait"]
 reqwest-09 = ["reqwest-0-9"]
-reqwest-010 = ["reqwest-0-10"]
+reqwest-010 = ["reqwest-0-10", "http-0-2"]
 
 [dependencies]
 async-trait = { version = "0.1", optional = true }
@@ -30,9 +30,10 @@ failure_derive = "0.1"
 futures-0-1 = { version = "0.1", optional = true, package = "futures" }
 futures-0-3 = { version = "0.3", optional = true, package = "futures" }
 http = "0.1"
+http-0-2 = { version = "0.2", optional = true, package = "http" }
 rand = "0.6"
 reqwest-0-9 = { version = "0.9", optional = true, package = "reqwest" }
-reqwest-0-10 = { version = "=0.10.0-alpha.2", optional = true, features = ["blocking"], package = "reqwest" }
+reqwest-0-10 = { version = "0.10", optional = true, features = ["blocking"], package = "reqwest" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha2 = "0.7"

src/reqwest/async_client.rs

@@ -1,6 +1,9 @@
 use super::super::{HttpRequest, HttpResponse};
 use super::Error;
 
+use http::header::HeaderName;
+use http::{HeaderMap, HeaderValue, StatusCode};
+
 pub use reqwest_0_10 as reqwest;
 
 ///
@@ -11,26 +14,41 @@ pub async fn async_http_client(
 ) -> Result<HttpResponse, Error<reqwest::Error>> {
     let client = reqwest::Client::builder()
         // Following redirects opens the client up to SSRF vulnerabilities.
-        .redirect(reqwest::RedirectPolicy::none())
+        .redirect(reqwest::redirect::Policy::none())
         .build()
         .map_err(Error::Reqwest)?;
 
     let mut request_builder = client
-        .request(request.method, request.url.as_str())
+        .request(
+            http_0_2::Method::from_bytes(request.method.as_str().as_ref())
+                .expect("failed to convert Method from http 0.2 to 0.1"),
+            request.url.as_str(),
+        )
         .body(request.body);
     for (name, value) in &request.headers {
-        request_builder = request_builder.header(name, value);
+        request_builder = request_builder.header(name.as_str(), value.as_bytes());
     }
     let request = request_builder.build().map_err(Error::Reqwest)?;
 
     let response = client.execute(request).await.map_err(Error::Reqwest)?;
 
     let status_code = response.status();
-    let headers = response.headers().clone();
+    let headers = response
+        .headers()
+        .iter()
+        .map(|(name, value)| {
+            (
+                HeaderName::from_bytes(name.as_str().as_ref())
+                    .expect("failed to convert HeaderName from http 0.2 to 0.1"),
+                HeaderValue::from_bytes(value.as_bytes())
+                    .expect("failed to convert HeaderValue from http 0.2 to 0.1"),
+            )
+        })
+        .collect::<HeaderMap>();
     let chunks = response.bytes().await.map_err(Error::Reqwest)?;
-
     Ok(HttpResponse {
-        status_code,
+        status_code: StatusCode::from_u16(status_code.as_u16())
+            .expect("failed to convert StatusCode from http 0.2 to 0.1"),
         headers,
         body: chunks.to_vec(),
     })

src/reqwest/mod.rs

@@ -63,7 +63,7 @@ mod blocking {
     #[cfg(feature = "reqwest-010")]
     use reqwest_0_10::blocking;
     #[cfg(feature = "reqwest-010")]
-    use reqwest_0_10::RedirectPolicy;
+    use reqwest_0_10::redirect::Policy as RedirectPolicy;
 
     use std::io::Read;
 
@@ -76,23 +76,59 @@ mod blocking {
             .redirect(RedirectPolicy::none())
             .build()
             .map_err(Error::Reqwest)?;
+
+        #[cfg(all(feature = "reqwest-09", not(feature = "reqwest-010")))]
         let mut request_builder = client
             .request(request.method, request.url.as_str())
             .body(request.body);
+        #[cfg(feature = "reqwest-010")]
+        let mut request_builder = client
+            .request(
+                http_0_2::Method::from_bytes(request.method.as_str().as_ref())
+                    .expect("failed to convert Method from http 0.2 to 0.1"),
+                request.url.as_str(),
+            )
+            .body(request.body);
+
         for (name, value) in &request.headers {
-            request_builder = request_builder.header(name, value);
+            request_builder = request_builder.header(name.as_str(), value.as_bytes());
         }
         let mut response = client
             .execute(request_builder.build().map_err(Error::Reqwest)?)
             .map_err(Error::Reqwest)?;
 
         let mut body = Vec::new();
         response.read_to_end(&mut body).map_err(Error::Io)?;
-        Ok(HttpResponse {
-            status_code: response.status(),
-            headers: response.headers().clone(),
-            body,
-        })
+
+        #[cfg(all(feature = "reqwest-09", not(feature = "reqwest-010")))]
+        {
+            Ok(HttpResponse {
+                status_code: response.status(),
+                headers: response.headers().clone(),
+                body,
+            })
+        }
+        #[cfg(feature = "reqwest-010")]
+        {
+            let headers = response
+                .headers()
+                .iter()
+                .map(|(name, value)| {
+                    (
+                        http::header::HeaderName::from_bytes(name.as_str().as_ref())
+                            .expect("failed to convert HeaderName from http 0.2 to 0.1"),
+                        http::HeaderValue::from_bytes(value.as_bytes())
+                            .expect("failed to convert HeaderValue from http 0.2 to 0.1"),
+                    )
+                })
+                .collect::<http::HeaderMap>();
+            Ok(HttpResponse {
+                status_code: http::StatusCode::from_u16(response.status().as_u16())
+                    .expect("failed to convert StatusCode from http 0.2 to 0.1"),
+                headers,
+                body,
+            })
+        }
     }
 }