forked/reqwest-impersonate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some slightly less trivial rustfmt changes.

Browse Source
This commit is contained in:
Tom Prince
2017-05-31 14:48:37 -06:00
parent 4c60e6d35f
commit a2c24a4009
7 changed files with 78 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/simple.rs
View File

@@ -12,8 +12,7 @@ error_chain! {
} }
fn run() -> Result<()> { fn run() -> Result<()> {
env_logger::init() env_logger::init().expect("Failed to initialize logger");
.expect("Failed to initialize logger");
println!("GET https://www.rust-lang.org"); println!("GET https://www.rust-lang.org");

37
src/client.rs
View File

@@ -21,7 +21,8 @@ use body::{self, Body};
use redirect::{self, RedirectPolicy, check_redirect, remove_sensitive_headers}; use redirect::{self, RedirectPolicy, check_redirect, remove_sensitive_headers};
use response::Response; use response::Response;
static DEFAULT_USER_AGENT: &'static str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); static DEFAULT_USER_AGENT: &'static str =
concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
/// A `Client` to make Requests with. /// A `Client` to make Requests with.
/// ///
@@ -74,8 +75,7 @@ impl Certificate {
/// ///
/// If the provided buffer is not valid DER, an error will be returned. /// If the provided buffer is not valid DER, an error will be returned.
pub fn from_der(der: &[u8]) -> ::Result<Certificate> { pub fn from_der(der: &[u8]) -> ::Result<Certificate> {
let inner = try_!( let inner = try_!(native_tls::Certificate::from_der(der)
native_tls::Certificate::from_der(der)
.map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); .map_err(|e| ::hyper::Error::Ssl(Box::new(e))));
Ok(Certificate(inner)) Ok(Certificate(inner))
} }
@@ -119,8 +119,7 @@ struct Config {
impl ClientBuilder { impl ClientBuilder {
/// Constructs a new `ClientBuilder` /// Constructs a new `ClientBuilder`
pub fn new() -> ::Result<ClientBuilder> { pub fn new() -> ::Result<ClientBuilder> {
let tls_connector_builder = try_!( let tls_connector_builder = try_!(native_tls::TlsConnector::builder()
native_tls::TlsConnector::builder()
.map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); .map_err(|e| ::hyper::Error::Ssl(Box::new(e))));
Ok(ClientBuilder { Ok(ClientBuilder {
config: Some(Config { config: Some(Config {
@@ -139,8 +138,10 @@ impl ClientBuilder {
pub fn build(&mut self) -> ::Result<Client> { pub fn build(&mut self) -> ::Result<Client> {
let config = self.take_config(); let config = self.take_config();
let tls_connector = try_!( let tls_connector = try_!(config
config.tls.build().map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); .tls
.build()
.map_err(|e| ::hyper::Error::Ssl(Box::new(e))));
let mut tls_client = NativeTlsClient::from(tls_connector); let mut tls_client = NativeTlsClient::from(tls_connector);
if !config.hostname_verification { if !config.hostname_verification {
tls_client.danger_disable_hostname_verification(true); tls_client.danger_disable_hostname_verification(true);
@@ -149,7 +150,9 @@ impl ClientBuilder {
let mut hyper_client = ::hyper::Client::with_connector( let mut hyper_client = ::hyper::Client::with_connector(
::hyper::client::Pool::with_connector( ::hyper::client::Pool::with_connector(
Default::default(), Default::default(),
::hyper::net::HttpsConnector::new(tls_client))); ::hyper::net::HttpsConnector::new(tls_client),
)
);
hyper_client.set_redirect_policy(::hyper::client::RedirectPolicy::FollowNone); hyper_client.set_redirect_policy(::hyper::client::RedirectPolicy::FollowNone);
@@ -168,7 +171,9 @@ impl ClientBuilder {
/// This can be used to connect to a server that has a self-signed /// This can be used to connect to a server that has a self-signed
/// certificate for example. /// certificate for example.
pub fn add_root_certificate(&mut self, cert: Certificate) -> ::Result<&mut ClientBuilder> { pub fn add_root_certificate(&mut self, cert: Certificate) -> ::Result<&mut ClientBuilder> {
try_!(self.config_mut().tls.add_root_certificate(cert.0) try_!(self.config_mut()
.tls
.add_root_certificate(cert.0)
.map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); .map_err(|e| ::hyper::Error::Ssl(Box::new(e))));
Ok(self) Ok(self)
} }
@@ -192,11 +197,15 @@ impl ClientBuilder {
// private // private
fn config_mut(&mut self) -> &mut Config { fn config_mut(&mut self) -> &mut Config {
self.config.as_mut().expect("ClientBuilder cannot be reused after building a Client") self.config
.as_mut()
.expect("ClientBuilder cannot be reused after building a Client")
} }
fn take_config(&mut self) -> Config { fn take_config(&mut self) -> Config {
self.config.take().expect("ClientBuilder cannot be reused after building a Client") self.config
.take()
.expect("ClientBuilder cannot be reused after building a Client")
} }
} }
@@ -497,7 +506,8 @@ impl RequestBuilder {
} }
} }
urls.push(url); urls.push(url);
let action = check_redirect(&client.redirect_policy.lock().unwrap(), &loc, &urls); let action =
check_redirect(&client.redirect_policy.lock().unwrap(), &loc, &urls);
match action { match action {
redirect::Action::Follow => loc, redirect::Action::Follow => loc,
@@ -688,7 +698,8 @@ mod tests {
r = r.form(&form_data); r = r.form(&form_data);
// Make sure the content type was set // Make sure the content type was set
assert_eq!(r.headers.get::<ContentType>(), Some(&ContentType::form_url_encoded())); assert_eq!(r.headers.get::<ContentType>(),
Some(&ContentType::form_url_encoded()));
let buf = body::read_to_string(r.body.unwrap().unwrap()).unwrap(); let buf = body::read_to_string(r.body.unwrap().unwrap()).unwrap();

6
src/error.rs
View File

@@ -192,8 +192,10 @@ pub fn too_many_redirects(url: Url) -> Error {
#[test] #[test]
fn test_error_get_ref_downcasts() { fn test_error_get_ref_downcasts() {
let err: Error = from(::hyper::Error::Status); let err: Error = from(::hyper::Error::Status);
let cause = err.get_ref().unwrap() let cause = err.get_ref()
.downcast_ref::<::hyper::Error>().unwrap(); .unwrap()
.downcast_ref::<::hyper::Error>()
.unwrap();
match cause { match cause {
&::hyper::Error::Status => (), &::hyper::Error::Status => (),

13
src/redirect.rs
View File

@@ -189,8 +189,8 @@ pub fn check_redirect(policy: &RedirectPolicy, next: &Url, previous: &[Url]) ->
pub fn remove_sensitive_headers(headers: &mut Headers, next: &Url, previous: &[Url]) { pub fn remove_sensitive_headers(headers: &mut Headers, next: &Url, previous: &[Url]) {
if let Some(previous) = previous.last() { if let Some(previous) = previous.last() {
let cross_host = next.host_str() != previous.host_str() let cross_host = next.host_str() != previous.host_str() ||
|| next.port_or_known_default() != previous.port_or_known_default(); next.port_or_known_default() != previous.port_or_known_default();
if cross_host { if cross_host {
headers.remove::<Authorization<String>>(); headers.remove::<Authorization<String>>();
headers.remove::<Cookie>(); headers.remove::<Cookie>();
@@ -231,7 +231,8 @@ fn test_redirect_policy_limit() {
previous.push(Url::parse("http://a.b.d/e/33").unwrap()); previous.push(Url::parse("http://a.b.d/e/33").unwrap());
assert_eq!(check_redirect(&policy, &next, &previous), Action::TooManyRedirects); assert_eq!(check_redirect(&policy, &next, &previous),
Action::TooManyRedirects);
} }
#[test] #[test]
@@ -258,11 +259,7 @@ fn test_remove_sensitive_headers() {
let mut headers = Headers::new(); let mut headers = Headers::new();
headers.set(Accept::star()); headers.set(Accept::star());
headers.set(Authorization("let me in".to_owned())); headers.set(Authorization("let me in".to_owned()));
headers.set( headers.set(Cookie(vec![String::from("foo=bar")]));
Cookie(vec![
String::from("foo=bar")
])
);
let next = Url::parse("http://initial-domain.com/path").unwrap(); let next = Url::parse("http://initial-domain.com/path").unwrap();
let mut prev = vec![Url::parse("http://initial-domain.com/new_path").unwrap()]; let mut prev = vec![Url::parse("http://initial-domain.com/new_path").unwrap()];

21
src/response.rs
View File

@@ -148,12 +148,13 @@ impl Decoder {
} }
let content_encoding_gzip: bool; let content_encoding_gzip: bool;
let mut is_gzip = { let mut is_gzip = {
content_encoding_gzip = res.headers.get::<ContentEncoding>().map_or(false, |encs|{ content_encoding_gzip = res.headers
encs.contains(&Encoding::Gzip) .get::<ContentEncoding>()
}); .map_or(false, |encs| encs.contains(&Encoding::Gzip));
content_encoding_gzip || res.headers.get::<TransferEncoding>().map_or(false, |encs|{ content_encoding_gzip ||
encs.contains(&Encoding::Gzip) res.headers
}) .get::<TransferEncoding>()
.map_or(false, |encs| encs.contains(&Encoding::Gzip))
}; };
if is_gzip { if is_gzip {
if let Some(content_length) = res.headers.get::<ContentLength>() { if let Some(content_length) = res.headers.get::<ContentLength>() {
@@ -249,12 +250,8 @@ impl Read for Peeked {
impl Read for Decoder { impl Read for Decoder {
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
match *self { match *self {
Decoder::PlainText(ref mut hyper_response) => { Decoder::PlainText(ref mut hyper_response) => hyper_response.read(buf),
hyper_response.read(buf) Decoder::Gzip { ref mut decoder, .. } => decoder.read(buf),
},
Decoder::Gzip{ref mut decoder, ..} => {
decoder.read(buf)
},
Decoder::Errored { ref mut err, .. } => { Decoder::Errored { ref mut err, .. } => {
Err(err.take().unwrap_or_else(previously_errored)) Err(err.take().unwrap_or_else(previously_errored))
} }

61
tests/client.rs
View File

@@ -32,8 +32,10 @@ fn test_get() {
assert_eq!(res.url().as_str(), &url); assert_eq!(res.url().as_str(), &url);
assert_eq!(res.status(), &reqwest::StatusCode::Ok); assert_eq!(res.status(), &reqwest::StatusCode::Ok);
assert_eq!(res.version(), &reqwest::HttpVersion::Http11); assert_eq!(res.version(), &reqwest::HttpVersion::Http11);
assert_eq!(res.headers().get(), Some(&reqwest::header::Server("test".to_string()))); assert_eq!(res.headers().get(),
assert_eq!(res.headers().get(), Some(&reqwest::header::ContentLength(0))); Some(&reqwest::header::Server("test".to_string())));
assert_eq!(res.headers().get(),
Some(&reqwest::header::ContentLength(0)));
let mut buf = [0; 1024]; let mut buf = [0; 1024];
let n = res.read(&mut buf).unwrap(); let n = res.read(&mut buf).unwrap();
@@ -84,12 +86,11 @@ fn test_redirect_301_and_302_and_303_changes_post_to_get() {
let url = format!("http://{}/{}", redirect.addr(), code); let url = format!("http://{}/{}", redirect.addr(), code);
let dst = format!("http://{}/{}", redirect.addr(), "dst"); let dst = format!("http://{}/{}", redirect.addr(), "dst");
let res = client.post(&url) let res = client.post(&url).send().unwrap();
.send()
.unwrap();
assert_eq!(res.url().as_str(), dst); assert_eq!(res.url().as_str(), dst);
assert_eq!(res.status(), &reqwest::StatusCode::Ok); assert_eq!(res.status(), &reqwest::StatusCode::Ok);
assert_eq!(res.headers().get(), Some(&reqwest::header::Server("test-dst".to_string()))); assert_eq!(res.headers().get(),
Some(&reqwest::header::Server("test-dst".to_string())));
} }
} }
@@ -139,13 +140,11 @@ fn test_redirect_307_and_308_tries_to_post_again() {
let url = format!("http://{}/{}", redirect.addr(), code); let url = format!("http://{}/{}", redirect.addr(), code);
let dst = format!("http://{}/{}", redirect.addr(), "dst"); let dst = format!("http://{}/{}", redirect.addr(), "dst");
let res = client.post(&url) let res = client.post(&url).body("Hello").send().unwrap();
.body("Hello")
.send()
.unwrap();
assert_eq!(res.url().as_str(), dst); assert_eq!(res.url().as_str(), dst);
assert_eq!(res.status(), &reqwest::StatusCode::Ok); assert_eq!(res.status(), &reqwest::StatusCode::Ok);
assert_eq!(res.headers().get(), Some(&reqwest::header::Server("test-dst".to_string()))); assert_eq!(res.headers().get(),
Some(&reqwest::header::Server("test-dst".to_string())));
} }
} }
@@ -178,7 +177,8 @@ fn test_redirect_307_does_not_try_if_reader_cannot_reset() {
}; };
let url = format!("http://{}/{}", redirect.addr(), code); let url = format!("http://{}/{}", redirect.addr(), code);
let res = client.post(&url) let res = client
.post(&url)
.body(reqwest::Body::new(&b"Hello"[..])) .body(reqwest::Body::new(&b"Hello"[..]))
.send() .send()
.unwrap(); .unwrap();
@@ -227,13 +227,11 @@ fn test_redirect_removes_sensitive_headers() {
let mut client = reqwest::Client::new().unwrap(); let mut client = reqwest::Client::new().unwrap();
client.referer(false); client.referer(false);
client.get(&format!("http://{}/sensitive", mid_server.addr())) client
.header( .get(&format!("http://{}/sensitive", mid_server.addr()))
reqwest::header::Cookie(vec![ .header(reqwest::header::Cookie(vec![String::from("foo=bar")]))
String::from("foo=bar") .send()
]) .unwrap();
)
.send().unwrap();
} }
#[test] #[test]
@@ -283,13 +281,12 @@ fn test_redirect_policy_can_stop_redirects_without_an_error() {
client.redirect(reqwest::RedirectPolicy::none()); client.redirect(reqwest::RedirectPolicy::none());
let url = format!("http://{}/no-redirect", server.addr()); let url = format!("http://{}/no-redirect", server.addr());
let res = client.get(&url) let res = client.get(&url).send().unwrap();
.send()
.unwrap();
assert_eq!(res.url().as_str(), url); assert_eq!(res.url().as_str(), url);
assert_eq!(res.status(), &reqwest::StatusCode::Found); assert_eq!(res.status(), &reqwest::StatusCode::Found);
assert_eq!(res.headers().get(), Some(&reqwest::header::Server("test-dont".to_string()))); assert_eq!(res.headers().get(),
Some(&reqwest::header::Server("test-dont".to_string())));
} }
#[test] #[test]
@@ -329,8 +326,10 @@ fn test_referer_is_not_set_if_disabled() {
}; };
let mut client = reqwest::Client::new().unwrap(); let mut client = reqwest::Client::new().unwrap();
client.referer(false); client.referer(false);
client.get(&format!("http://{}/no-refer", server.addr())) client
.send().unwrap(); .get(&format!("http://{}/no-refer", server.addr()))
.send()
.unwrap();
} }
#[test] #[test]
@@ -353,7 +352,8 @@ fn test_accept_header_is_not_changed_if_set() {
}; };
let client = reqwest::Client::new().unwrap(); let client = reqwest::Client::new().unwrap();
let res = client.get(&format!("http://{}/accept", server.addr())) let res = client
.get(&format!("http://{}/accept", server.addr()))
.header(reqwest::header::Accept::json()) .header(reqwest::header::Accept::json())
.send() .send()
.unwrap(); .unwrap();
@@ -421,8 +421,7 @@ fn test_gzip_response() {
", ",
response: response response: response
}; };
let mut res = reqwest::get(&format!("http://{}/gzip", server.addr())) let mut res = reqwest::get(&format!("http://{}/gzip", server.addr())).unwrap();
.unwrap();
let mut body = ::std::string::String::new(); let mut body = ::std::string::String::new();
match res.read_to_string(&mut body) { match res.read_to_string(&mut body) {
@@ -453,7 +452,8 @@ fn test_gzip_empty_body() {
}; };
let client = reqwest::Client::new().unwrap(); let client = reqwest::Client::new().unwrap();
let mut res = client.head(&format!("http://{}/gzip", server.addr())) let mut res = client
.head(&format!("http://{}/gzip", server.addr()))
.send() .send()
.unwrap(); .unwrap();
@@ -483,8 +483,7 @@ fn test_gzip_invalid_body() {
0" 0"
}; };
let mut res = reqwest::get(&format!("http://{}/gzip", server.addr())) let mut res = reqwest::get(&format!("http://{}/gzip", server.addr())).unwrap();
.unwrap();
// this tests that the request.send() didn't error, but that the error // this tests that the request.send() didn't error, but that the error
// is in reading the body // is in reading the body

3
tests/server.rs
View File

@@ -14,7 +14,8 @@ impl Server {
} }
} }
static DEFAULT_USER_AGENT: &'static str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); static DEFAULT_USER_AGENT: &'static str =
concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
pub fn spawn(txns: Vec<(Vec<u8>, Vec<u8>)>) -> Server { pub fn spawn(txns: Vec<(Vec<u8>, Vec<u8>)>) -> Server {
let listener = net::TcpListener::bind("127.0.0.1:0").unwrap(); let listener = net::TcpListener::bind("127.0.0.1:0").unwrap();