mirror/nlnetlabs-routinator
1
0
Fork 0
mirror of https://github.com/NLnetLabs/routinator.git synced 2024-05-19 06:50:04 +00:00
Code Issues Releases Activity

Merge pull request #692 from NLnetLabs/http-tls-fix

Browse Source 
TlsTcpStream mustn’t crash after a failed TLS handshake.
This commit is contained in:
Martin Hoffmann
2022-01-21 11:06:28 +01:00
committed by GitHub
parent 826c76a9f6 7bbd8e2140
commit 361599b796
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/utils/tls.rs
View File

@ -96,10 +96,24 @@ pub fn create_server_config(
//------------ TlsTcpStream --------------------------------------------------
pin_project! {
/// A TLS stream that behaves like a regular TCP stream.
///
/// Specifically, `AsyncRead` and `AsyncWrite` will return `Poll::NotReady`
/// until the TLS accept machinery has concluded.
#[project = TlsTcpStreamProj]
enum TlsTcpStream {
/// The TLS handshake is going on.
Accept { #[pin] fut: Accept<TcpStream> },
/// We have a working TLS stream.
Stream { #[pin] fut: TlsStream<TcpStream> },
/// TLS handshake has failed.
///
/// Because hyper still wants to do a clean flush and shutdown, we
/// need to still work in this state. For read and write, we just
/// keep returning the clean shutdown indiciation of zero length
/// operations.
Empty,
}
}
@ -126,8 +140,7 @@ impl TlsTcpStream {
}
}
}
TlsTcpStreamProj::Stream { .. } => Poll::Ready(Ok(self)),
TlsTcpStreamProj::Empty => panic!("polling a concluded future")
_ => Poll::Ready(Ok(self)),
}
}
}
@ -146,6 +159,7 @@ impl AsyncRead for TlsTcpStream {
TlsTcpStreamProj::Stream { fut } => {
fut.poll_read(cx, buf)
}
TlsTcpStreamProj::Empty => { Poll::Ready(Ok(())) }
_ => unreachable!()
}
}
@ -165,6 +179,7 @@ impl AsyncWrite for TlsTcpStream {
TlsTcpStreamProj::Stream { fut } => {
fut.poll_write(cx, buf)
}
TlsTcpStreamProj::Empty => { Poll::Ready(Ok(0)) }
_ => unreachable!()
}
}
@ -181,6 +196,7 @@ impl AsyncWrite for TlsTcpStream {
TlsTcpStreamProj::Stream { fut } => {
fut.poll_flush(cx)
}
TlsTcpStreamProj::Empty => { Poll::Ready(Ok(())) }
_ => unreachable!()
}
}
@ -197,6 +213,7 @@ impl AsyncWrite for TlsTcpStream {
TlsTcpStreamProj::Stream { fut } => {
fut.poll_shutdown(cx)
}
TlsTcpStreamProj::Empty => { Poll::Ready(Ok(())) }
_ => unreachable!()
}
}