Skip to content

Commit 493d089

Browse files
committed
conn: fuse writes for connections with errors
1 parent db00e01 commit 493d089

2 files changed

Lines changed: 64 additions & 0 deletions

File tree

‎rustls/src/conn.rs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,10 @@ https://docs.rs/rustls/latest/rustls/manual/_03_howto/index.html#unexpected-eof"
327327
/// TLS handshake completes, and sends it as soon
328328
/// as it can. See [`ConnectionCommon::set_buffer_limit`] to control
329329
/// the size of this buffer.
330+
///
331+
/// If the connection previously encountered a fatal error (for example, while
332+
/// processing received data in [`Connection::process_new_packets`]), this returns
333+
/// that error, even if `buf` is empty.
330334
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
331335
self.sink.write(buf)
332336
}
@@ -351,8 +355,19 @@ https://docs.rs/rustls/latest/rustls/manual/_03_howto/index.html#unexpected-eof"
351355
fn flush(&mut self) -> io::Result<()>;
352356
}
353357

358+
impl<T> ConnectionCommon<T> {
359+
/// Return the fatal error this connection previously encountered, if any.
360+
fn check_error(&self) -> io::Result<()> {
361+
match &self.core.state {
362+
Ok(_) => Ok(()),
363+
Err(err) => Err(io::Error::new(io::ErrorKind::InvalidData, err.clone())),
364+
}
365+
}
366+
}
367+
354368
impl<T> PlaintextSink for ConnectionCommon<T> {
355369
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
370+
self.check_error()?;
356371
let len = self
357372
.core
358373
.common_state
@@ -362,6 +377,7 @@ https://docs.rs/rustls/latest/rustls/manual/_03_howto/index.html#unexpected-eof"
362377
}
363378

364379
fn write_vectored(&mut self, bufs: &[io::IoSlice<'_>]) -> io::Result<usize> {
380+
self.check_error()?;
365381
let payload_owner: Vec<&[u8]>;
366382
let payload = match bufs.len() {
367383
0 => return Ok(0),

‎rustls/tests/api.rs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2294,6 +2294,54 @@ fn server_error_is_sticky() {
22942294
assert!(err.is_err());
22952295
}
22962296

2297+
#[test]
2298+
fn write_reports_sticky_error() {
2299+
let (mut client, mut server) = make_pair(KeyType::Rsa2048, &provider::default_provider());
2300+
do_handshake(&mut client, &mut server);
2301+
2302+
// corrupt a record, so the server fails and sends a fatal alert
2303+
client
2304+
.writer()
2305+
.write_all(b"hello")
2306+
.unwrap();
2307+
let mut client_output = Vec::new();
2308+
client
2309+
.write_tls(&mut client_output)
2310+
.unwrap();
2311+
*client_output.last_mut().unwrap() ^= 1;
2312+
server
2313+
.read_tls(&mut client_output.as_slice())
2314+
.unwrap();
2315+
assert_eq!(server.process_new_packets(), Err(Error::DecryptError));
2316+
let mut server_output = Vec::new();
2317+
server
2318+
.write_tls(&mut server_output)
2319+
.unwrap();
2320+
2321+
for data in [&b"world"[..], b""] {
2322+
let err = server.writer().write(data).unwrap_err();
2323+
assert_eq!(err.kind(), io::ErrorKind::InvalidData);
2324+
assert_eq!(err.to_string(), Error::DecryptError.to_string());
2325+
}
2326+
assert!(!server.wants_write());
2327+
2328+
// the client receives the alert, but has not sent one itself
2329+
client
2330+
.read_tls(&mut server_output.as_slice())
2331+
.unwrap();
2332+
let expected = Error::AlertReceived(AlertDescription::BadRecordMac);
2333+
assert_eq!(client.process_new_packets(), Err(expected.clone()));
2334+
assert!(!client.wants_write());
2335+
2336+
let err = client
2337+
.writer()
2338+
.write(b"world")
2339+
.unwrap_err();
2340+
assert_eq!(err.kind(), io::ErrorKind::InvalidData);
2341+
assert_eq!(err.to_string(), expected.to_string());
2342+
assert!(!client.wants_write());
2343+
}
2344+
22972345
#[test]
22982346
fn server_flush_does_nothing() {
22992347
let (_, mut server) = make_pair(KeyType::Rsa2048, &provider::default_provider());

0 commit comments

Comments
 (0)