Skip to content

Commit d67cb71

Browse files
committed
stream: provide backpressure while buffering received plaintext
1 parent 7a69ade commit d67cb71

2 files changed

Lines changed: 57 additions & 0 deletions

File tree

‎rustls/src/stream.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ where
4545
}
4646

4747
fn prepare_read(&mut self) -> Result<()> {
48+
// Return buffered plaintext without doing any IO: `complete_io()` does not read
49+
// while plaintext is buffered, so blocked writes would otherwise hide it.
50+
if !self.conn.received_plaintext.is_empty() {
51+
return Ok(());
52+
}
53+
4854
self.complete_prior_io()?;
4955

5056
// We call complete_io() in a loop since a single call may read only

‎rustls/tests/api.rs‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3549,6 +3549,57 @@ fn stream_reports_error_after_write_accepted_plaintext() {
35493549
assert_eq!(err.to_string(), Error::DecryptError.to_string());
35503550
}
35513551

3552+
#[test]
3553+
fn stream_write_applies_backpressure_to_received_plaintext() {
3554+
let (mut client, mut server) = make_pair(KeyType::Rsa2048, &provider::default_provider());
3555+
do_handshake(&mut client, &mut server);
3556+
3557+
// the peer sends several records, but never reads what we send
3558+
let mut reads = Vec::new();
3559+
for _ in 0..3 {
3560+
server
3561+
.writer()
3562+
.write_all(b"hello")
3563+
.unwrap();
3564+
let mut server_output = Vec::new();
3565+
server
3566+
.write_tls(&mut server_output)
3567+
.unwrap();
3568+
reads.insert(0, server_output);
3569+
}
3570+
3571+
let mut pipe = TestNonBlockIo {
3572+
writes: vec![],
3573+
reads,
3574+
};
3575+
let mut client_stream = Stream::new(&mut client, &mut pipe);
3576+
3577+
// writing only reads more data while no received plaintext is buffered
3578+
assert_eq!(client_stream.write(b"world").unwrap(), 5);
3579+
for _ in 0..5 {
3580+
assert_eq!(
3581+
client_stream
3582+
.write(b"world")
3583+
.unwrap_err()
3584+
.kind(),
3585+
io::ErrorKind::WouldBlock
3586+
);
3587+
}
3588+
assert_eq!(
3589+
client_stream
3590+
.conn
3591+
.process_new_packets()
3592+
.unwrap()
3593+
.plaintext_bytes_to_read(),
3594+
5
3595+
);
3596+
3597+
// buffered plaintext is still readable while writes are blocked
3598+
for _ in 0..3 {
3599+
check_read(&mut client_stream, b"hello");
3600+
}
3601+
}
3602+
35523603
fn make_disjoint_suite_configs() -> (ClientConfig, ServerConfig) {
35533604
let kt = KeyType::Rsa2048;
35543605
let client_provider = CryptoProvider {

0 commit comments

Comments
 (0)