X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-block-sync%2Fsrc%2Fhttp.rs;h=0721babfde3d1b626051ba1ccccb7240d1f5a5a7;hb=84909447e9efb9737f6d7bfaecd6f0d863464625;hp=2e70e18659936e2746638ba684b36ce20c3095ca;hpb=e0986de47796848efa1619624dde0fe6e9908d81;p=rust-lightning diff --git a/lightning-block-sync/src/http.rs b/lightning-block-sync/src/http.rs index 2e70e186..0721babf 100644 --- a/lightning-block-sync/src/http.rs +++ b/lightning-block-sync/src/http.rs @@ -5,9 +5,10 @@ use chunked_transfer; use serde_json; use std::convert::TryFrom; +use std::fmt; #[cfg(not(feature = "tokio"))] use std::io::Write; -use std::net::ToSocketAddrs; +use std::net::{SocketAddr, ToSocketAddrs}; use std::time::Duration; #[cfg(feature = "tokio")] @@ -96,6 +97,7 @@ impl<'a> std::net::ToSocketAddrs for &'a HttpEndpoint { /// Client for making HTTP requests. pub(crate) struct HttpClient { + address: SocketAddr, stream: TcpStream, } @@ -118,7 +120,7 @@ impl HttpClient { TcpStream::from_std(stream)? }; - Ok(Self { stream }) + Ok(Self { address, stream }) } /// Sends a `GET` request for a resource identified by `uri` at the `host`. @@ -161,7 +163,6 @@ impl HttpClient { /// Sends an HTTP request message and reads the response, returning its body. Attempts to /// reconnect and retry if the connection has been closed. async fn send_request_with_retry(&mut self, request: &str) -> std::io::Result> { - let endpoint = self.stream.peer_addr().unwrap(); match self.send_request(request).await { Ok(bytes) => Ok(bytes), Err(_) => { @@ -175,7 +176,7 @@ impl HttpClient { tokio::time::sleep(Duration::from_millis(100)).await; #[cfg(not(feature = "tokio"))] std::thread::sleep(Duration::from_millis(100)); - *self = Self::connect(endpoint)?; + *self = Self::connect(self.address)?; self.send_request(request).await }, } @@ -348,21 +349,33 @@ impl HttpClient { if !status.is_ok() { // TODO: Handle 3xx redirection responses. - let error_details = match String::from_utf8(contents) { - // Check that the string is all-ASCII with no control characters before returning - // it. - Ok(s) if s.as_bytes().iter().all(|c| c.is_ascii() && !c.is_ascii_control()) => s, - _ => "binary".to_string() + let error = HttpError { + status_code: status.code.to_string(), + contents, }; - let error_msg = format!("Errored with status: {} and contents: {}", - status.code, error_details); - return Err(std::io::Error::new(std::io::ErrorKind::Other, error_msg)); + return Err(std::io::Error::new(std::io::ErrorKind::Other, error)); } Ok(contents) } } +/// HTTP error consisting of a status code and body contents. +#[derive(Debug)] +pub(crate) struct HttpError { + pub(crate) status_code: String, + pub(crate) contents: Vec, +} + +impl std::error::Error for HttpError {} + +impl fmt::Display for HttpError { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + let contents = String::from_utf8_lossy(&self.contents); + write!(f, "status_code: {}, contents: {}", self.status_code, contents) + } +} + /// HTTP response status code as defined by [RFC 7231]. /// /// [RFC 7231]: https://tools.ietf.org/html/rfc7231#section-6 @@ -538,16 +551,16 @@ pub(crate) mod client_tests { } impl HttpServer { - pub fn responding_with_ok(body: MessageBody) -> Self { + fn responding_with_body(status: &str, body: MessageBody) -> Self { let response = match body { - MessageBody::Empty => "HTTP/1.1 200 OK\r\n\r\n".to_string(), + MessageBody::Empty => format!("{}\r\n\r\n", status), MessageBody::Content(body) => { let body = body.to_string(); format!( - "HTTP/1.1 200 OK\r\n\ + "{}\r\n\ Content-Length: {}\r\n\ \r\n\ - {}", body.len(), body) + {}", status, body.len(), body) }, MessageBody::ChunkedContent(body) => { let mut chuncked_body = Vec::new(); @@ -557,18 +570,26 @@ pub(crate) mod client_tests { encoder.write_all(body.to_string().as_bytes()).unwrap(); } format!( - "HTTP/1.1 200 OK\r\n\ + "{}\r\n\ Transfer-Encoding: chunked\r\n\ \r\n\ - {}", String::from_utf8(chuncked_body).unwrap()) + {}", status, String::from_utf8(chuncked_body).unwrap()) }, }; HttpServer::responding_with(response) } + pub fn responding_with_ok(body: MessageBody) -> Self { + HttpServer::responding_with_body("HTTP/1.1 200 OK", body) + } + pub fn responding_with_not_found() -> Self { - let response = "HTTP/1.1 404 Not Found\r\n\r\n".to_string(); - HttpServer::responding_with(response) + HttpServer::responding_with_body::("HTTP/1.1 404 Not Found", MessageBody::Empty) + } + + pub fn responding_with_server_error(content: T) -> Self { + let body = MessageBody::Content(content); + HttpServer::responding_with_body("HTTP/1.1 500 Internal Server Error", body) } fn responding_with(response: String) -> Self { @@ -615,7 +636,10 @@ pub(crate) mod client_tests { #[test] fn connect_to_unresolvable_host() { match HttpClient::connect(("example.invalid", 80)) { - Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::Other), + Err(e) => { + assert!(e.to_string().contains("failed to lookup address information") || + e.to_string().contains("No such host"), "{:?}", e); + }, Ok(_) => panic!("Expected error"), } } @@ -732,16 +756,15 @@ pub(crate) mod client_tests { #[tokio::test] async fn read_error() { - let response = String::from( - "HTTP/1.1 500 Internal Server Error\r\n\ - Content-Length: 10\r\n\r\ntest error\r\n"); - let server = HttpServer::responding_with(response); + let server = HttpServer::responding_with_server_error("foo"); let mut client = HttpClient::connect(&server.endpoint()).unwrap(); match client.get::("/foo", "foo.com").await { Err(e) => { - assert_eq!(e.get_ref().unwrap().to_string(), "Errored with status: 500 and contents: test error"); assert_eq!(e.kind(), std::io::ErrorKind::Other); + let http_error = e.into_inner().unwrap().downcast::().unwrap(); + assert_eq!(http_error.status_code, "500"); + assert_eq!(http_error.contents, "foo".as_bytes()); }, Ok(_) => panic!("Expected error"), }