gsadmin/noq
1
0
Fork 0
mirror of https://github.com/n0-computer/noq.git synced 2026-09-25 04:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inverted 0-RTT transport parameter validation

Browse Source
This commit is contained in:
Benjamin Saunders
2020-05-21 14:57:59 -07:00
committed by Dirkjan Ochtman
parent e15b2be713
commit 085236b2f4
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quinn-proto/src/connection/mod.rs
+1 -1
View File
@@ -1831,7 +1831,7 @@ where
self.reject_0rtt();
} else {
self.accepted_0rtt = true;
params.validate_0rtt(&self.peer_params)?;
params.validate_resumption_from(&self.peer_params)?;
}
}
if let Some(token) = params.stateless_reset_token {
quinn-proto/src/transport_parameters.rs
+26 -9
View File
@@ -153,15 +153,18 @@ impl TransportParameters {
/// Check that these parameters are legal when resuming from
/// certain cached parameters
pub(crate) fn validate_0rtt(&self, cached: &TransportParameters) -> Result<(), TransportError> {
if cached.active_connection_id_limit < self.active_connection_id_limit
|| cached.initial_max_data < self.initial_max_data
|| cached.initial_max_stream_data_bidi_local < self.initial_max_stream_data_bidi_local
|| cached.initial_max_stream_data_bidi_remote < self.initial_max_stream_data_bidi_remote
|| cached.initial_max_stream_data_uni < self.initial_max_stream_data_uni
|| cached.initial_max_streams_bidi < self.initial_max_streams_bidi
|| cached.initial_max_streams_uni < self.initial_max_streams_uni
|| cached.max_datagram_frame_size < self.max_datagram_frame_size
pub(crate) fn validate_resumption_from(
&self,
cached: &TransportParameters,
) -> Result<(), TransportError> {
if cached.active_connection_id_limit > self.active_connection_id_limit
|| cached.initial_max_data > self.initial_max_data
|| cached.initial_max_stream_data_bidi_local > self.initial_max_stream_data_bidi_local
|| cached.initial_max_stream_data_bidi_remote > self.initial_max_stream_data_bidi_remote
|| cached.initial_max_stream_data_uni > self.initial_max_stream_data_uni
|| cached.initial_max_streams_bidi > self.initial_max_streams_bidi
|| cached.initial_max_streams_uni > self.initial_max_streams_uni
|| cached.max_datagram_frame_size > self.max_datagram_frame_size
{
return Err(TransportError::PROTOCOL_VIOLATION(
"0-RTT accepted with incompatible transport parameters",
@@ -468,4 +471,18 @@ mod test {
params
);
}
#[test]
fn resumption_params_validation() {
let high_limit = TransportParameters {
initial_max_streams_uni: 32,
..Default::default()
};
let low_limit = TransportParameters {
initial_max_streams_uni: 16,
..Default::default()
};
high_limit.validate_resumption_from(&low_limit).unwrap();
low_limit.validate_resumption_from(&high_limit).unwrap_err();
}
}