forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle invalid stream deps with RST_STREAM

Browse Source
This commit is contained in:
Carl Lerche
2017-08-25 22:54:54 -04:00
parent 14f35f1be6
commit 15f6dfd2c1
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/proto/framed_read.rs
View File

@@ -101,7 +101,16 @@ impl<T> FramedRead<T> {
// Parse the header frame w/o parsing the payload // Parse the header frame w/o parsing the payload
let (mut headers, payload) = match frame::Headers::load(head, bytes) { let (mut headers, payload) = match frame::Headers::load(head, bytes) {
Ok(res) => res, Ok(res) => res,
Err(_) => unimplemented!(), Err(frame::Error::InvalidDependencyId) => {
// A stream cannot depend on itself. An endpoint MUST
// treat this as a stream error (Section 5.4.2) of type
// `PROTOCOL_ERROR`.
return Err(Stream {
id: head.stream_id(),
reason: ProtocolError,
});
}
_ => return Err(Connection(ProtocolError)),
}; };
if headers.is_end_headers() { if headers.is_end_headers() {
@@ -141,8 +150,19 @@ impl<T> FramedRead<T> {
res.map_err(|_| Connection(ProtocolError))?.into() res.map_err(|_| Connection(ProtocolError))?.into()
} }
Kind::Priority => { Kind::Priority => {
let res = frame::Priority::load(head, &bytes[frame::HEADER_LEN..]); match frame::Priority::load(head, &bytes[frame::HEADER_LEN..]) {
res.map_err(|_| Connection(ProtocolError))?.into() Ok(frame) => frame.into(),
Err(frame::Error::InvalidDependencyId) => {
// A stream cannot depend on itself. An endpoint MUST
// treat this as a stream error (Section 5.4.2) of type
// `PROTOCOL_ERROR`.
return Err(Stream {
id: head.stream_id(),
reason: ProtocolError,
});
}
Err(_) => return Err(Connection(ProtocolError)),
}
} }
Kind::Continuation => { Kind::Continuation => {
// TODO: Un-hack this // TODO: Un-hack this