Merge pull request #298 from riptide-org/ISSUE-199-READ-BODY-ON-FAILED-READ

Error response on client type returns request body upon non receiving non 101 status code from server
pull/317/head
Alexey Galakhov 2 years ago committed by GitHub
commit 438210688f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/error.rs
  2. 16
      src/handshake/client.rs
  3. 5
      src/handshake/server.rs

@ -65,7 +65,7 @@ pub enum Error {
/// HTTP error. /// HTTP error.
#[error("HTTP error: {}", .0.status())] #[error("HTTP error: {}", .0.status())]
#[cfg(feature = "handshake")] #[cfg(feature = "handshake")]
Http(Response<Option<String>>), Http(Response<Option<Vec<u8>>>),
/// HTTP format error. /// HTTP format error.
#[error("HTTP format error: {0}")] #[error("HTTP format error: {0}")]
#[cfg(feature = "handshake")] #[cfg(feature = "handshake")]

@ -26,7 +26,7 @@ use crate::{
pub type Request = HttpRequest<()>; pub type Request = HttpRequest<()>;
/// Client response type. /// Client response type.
pub type Response = HttpResponse<()>; pub type Response = HttpResponse<Option<Vec<u8>>>;
/// Client handshake role. /// Client handshake role.
#[derive(Debug)] #[derive(Debug)]
@ -83,7 +83,15 @@ impl<S: Read + Write> HandshakeRole for ClientHandshake<S> {
ProcessingResult::Continue(HandshakeMachine::start_read(stream)) ProcessingResult::Continue(HandshakeMachine::start_read(stream))
} }
StageResult::DoneReading { stream, result, tail } => { StageResult::DoneReading { stream, result, tail } => {
let result = self.verify_data.verify_response(result)?; let result = match self.verify_data.verify_response(result) {
Ok(r) => r,
Err(Error::Http(mut e)) => {
*e.body_mut() = Some(tail);
return Err(Error::Http(e))
},
Err(e) => return Err(e),
};
debug!("Client handshake done."); debug!("Client handshake done.");
let websocket = let websocket =
WebSocket::from_partially_read(stream, tail, Role::Client, self.config); WebSocket::from_partially_read(stream, tail, Role::Client, self.config);
@ -182,7 +190,7 @@ impl VerifyData {
// 1. If the status code received from the server is not 101, the // 1. If the status code received from the server is not 101, the
// client handles the response per HTTP [RFC2616] procedures. (RFC 6455) // client handles the response per HTTP [RFC2616] procedures. (RFC 6455)
if response.status() != StatusCode::SWITCHING_PROTOCOLS { if response.status() != StatusCode::SWITCHING_PROTOCOLS {
return Err(Error::Http(response.map(|_| None))); return Err(Error::Http(response));
} }
let headers = response.headers(); let headers = response.headers();
@ -255,7 +263,7 @@ impl<'h, 'b: 'h> FromHttparse<httparse::Response<'h, 'b>> for Response {
let headers = HeaderMap::from_httparse(raw.headers)?; let headers = HeaderMap::from_httparse(raw.headers)?;
let mut response = Response::new(()); let mut response = Response::new(None);
*response.status_mut() = StatusCode::from_u16(raw.code.expect("Bug: no HTTP status code"))?; *response.status_mut() = StatusCode::from_u16(raw.code.expect("Bug: no HTTP status code"))?;
*response.headers_mut() = headers; *response.headers_mut() = headers;
// TODO: httparse only supports HTTP 0.9/1.0/1.1 but not HTTP 2.0 // TODO: httparse only supports HTTP 0.9/1.0/1.1 but not HTTP 2.0

@ -277,7 +277,10 @@ impl<S: Read + Write, C: Callback> HandshakeRole for ServerHandshake<S, C> {
StageResult::DoneWriting(stream) => { StageResult::DoneWriting(stream) => {
if let Some(err) = self.error_response.take() { if let Some(err) = self.error_response.take() {
debug!("Server handshake failed."); debug!("Server handshake failed.");
return Err(Error::Http(err));
let (parts, body) = err.into_parts();
let body = body.map(|b| b.as_bytes().to_vec());
return Err(Error::Http(http::Response::from_parts(parts, body)));
} else { } else {
debug!("Server handshake done."); debug!("Server handshake done.");
let websocket = WebSocket::from_raw_socket(stream, Role::Server, self.config); let websocket = WebSocket::from_raw_socket(stream, Role::Server, self.config);

Loading…
Cancel
Save