Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion quest/m2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ lite-07; bitrate enforcement is not part of this release.
- [Lint override and deprecation audit](/quest/m2/audit-lints.md) - repeat the suppression and deprecation audit after the release ships, starting with clippy on the macOS and Windows targets
- [Bound cmsg payload reads](/quest/m2/cmsg-decode-bound.md) - `CMsg::decode` refuses a short control message, and Tokio sockets keep the ECN mark
- [Tenant matrix on both runtimes](/quest/m2/tenant-matrix.md) - tenant, mount, HTTP, normalization, and revalidation boundaries are tested on Tokio and io_uring
- [One typed SETUP parse](/quest/m2/setup-parse-once.md) - one function replaces three SETUP parameter parses
- [Archive reads against a real store](/quest/m2/archive-store-bench.md) - LIST/GET counts and latency over track count
- [A malformed track says so downstream](/quest/m2/malformed-track-status.md) - subscribers and bindings see a malformed track, not INTERNAL_ERROR
- [Branch checks lint examples](/quest/m2/lint-examples.md) - `just check` runs clippy on the selected crates' examples
Expand Down
13 changes: 0 additions & 13 deletions quest/m2/setup-parse-once.md

This file was deleted.

4 changes: 2 additions & 2 deletions rs/moq-net/src/fuzz.rs
Original file line number Diff line number Diff line change
Expand Up @@ -758,9 +758,9 @@ where
let outer = crate::Version::Ietf(version);
if let Ok((message, _)) = T::decode_slice(data, outer) {
let parameters = parameters(&message);
if ietf::decode_peer_setup(parameters.clone(), version, true).is_ok() {
if ietf::decode_peer_setup(parameters, version, true).is_ok() {
assert!(
ietf::decode_peer_setup(parameters.clone(), version, false).is_ok(),
ietf::decode_peer_setup(parameters, version, false).is_ok(),
"a server's Setup Options are refused from a client"
);
}
Expand Down
123 changes: 58 additions & 65 deletions rs/moq-net/src/ietf/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -486,17 +486,8 @@ pub struct PeerSetup {
/// The SETUP's encoded size, counted once the session's stats are known.
pub size: usize,

/// The request path the peer advertised, for URL-less transports.
pub path: Option<String>,

/// The credential the peer presented in its `AUTHORIZATION TOKEN` option.
pub token: Option<crate::setup::Token>,

/// The implementation the peer advertised in its `IMPLEMENTATION` option.
pub implementation: Option<String>,

/// The Setup Options it declared (see [`cluster`] and [`solicit`]).
pub declared: peer::Peer,
/// What the SETUP's parameters say.
pub options: SetupOptions,

/// Uni streams that arrived before the SETUP, type peeked but unread. The drafts say
/// to buffer early data until the control streams arrive, so the session classifies
Expand Down Expand Up @@ -547,70 +538,72 @@ pub async fn accept_setup(session: &mut Transport, version: Version) -> Result<P

reader.set_priority(crate::priority::RECV_CONTROL);
let (setup, size) = reader.decode_sized::<setup::Setup>().await?;
let (params, _) = ietf::Parameters::decode_slice(&setup.parameters, version)?;
if session.address() == crate::transport::Address::Uri && params.get_bytes(ietf::ParameterBytes::Path).is_some()
{
let options = decode_peer_setup(&setup.parameters, version, false)?;
if session.address() == crate::transport::Address::Uri && options.path.is_some() {
return Err(Error::ProtocolViolation);
}
let path = match params.get_bytes(ietf::ParameterBytes::Path) {
Some(bytes) => Some(
std::str::from_utf8(bytes)
.map_err(|_| Error::Decode(crate::DecodeError::InvalidValue))?
.to_owned(),
),
None => None,
};
let token = super::token::from_setup(&params, version)?;
let implementation =
crate::setup::decode_implementation(params.get_bytes(ietf::ParameterBytes::Implementation))?;
let declared = peer_from_params(&params, version)?;

return Ok(PeerSetup {
stream: reader,
size,
path,
token,
implementation,
declared,
options,
early,
});
}
}

/// Parse the Setup Options we act on out of a raw SETUP parameter block, refusing any the
/// peer's role may not send.
pub(crate) fn decode_peer_setup(
parameters: bytes::Bytes,
version: Version,
client: bool,
) -> Result<(peer::Peer, Option<String>), Error> {
let (params, _) = ietf::Parameters::decode_slice(&parameters, version)?;
/// What a peer's SETUP parameters say, parsed by [`decode_peer_setup`] for every caller.
pub struct SetupOptions {
/// The request path the peer advertised, for URL-less transports.
pub path: Option<String>,

/// The credential the peer presented in its `AUTHORIZATION TOKEN` option.
pub token: Option<crate::setup::Token>,

/// The implementation the peer advertised in its `IMPLEMENTATION` option.
pub implementation: Option<String>,

/// The Setup Options it declared (see [`cluster`] and [`solicit`]).
pub declared: peer::Peer,
}

/// Parse a peer's raw SETUP parameter block, refusing any option the peer's role may not
/// send. `client` is our role, so `true` means the block came from a server.
pub(crate) fn decode_peer_setup(parameters: &[u8], version: Version, client: bool) -> Result<SetupOptions, Error> {
let (params, _) = ietf::Parameters::decode_slice(parameters, version)?;
let path = params.get_bytes(ietf::ParameterBytes::Path);
// A server sends neither PATH nor AUTHORITY (draft-22 sections 9.1.1 and 9.1.2).
if client && params.get_bytes(ietf::ParameterBytes::Path).is_some() {
if client && path.is_some() {
return Err(SessionError::InvalidPath.into());
}
if client && params.get_bytes(ietf::ParameterBytes::Authority).is_some() {
return Err(SessionError::InvalidAuthority.into());
}
// Nothing here uses the peer's token, but one that cannot be decoded still closes the
// session (draft-22 section 8.9).
super::token::from_setup(&params, version)?;
let implementation = crate::setup::decode_implementation(params.get_bytes(ietf::ParameterBytes::Implementation))?;
Ok((peer_from_params(&params, version)?, implementation))
}
let path = match path {
Some(bytes) => Some(
std::str::from_utf8(bytes)
.map_err(|_| Error::Decode(crate::DecodeError::InvalidValue))?
.to_owned(),
),
None => None,
};

/// The Setup Options we act on, out of an already-decoded parameter block. One place, so
/// a future option reaches both the pre-read accept path and the uni loop.
fn peer_from_params(params: &ietf::Parameters, version: Version) -> Result<peer::Peer, crate::DecodeError> {
Ok(peer::Peer {
cluster: cluster::peer_from_setup(params)?,
solicit: solicit::from_setup(params, version)?,
hidden: hidden::from_setup(params, version),
max_age: max_age::from_setup(params, version),
auth: auth::from_setup(params) == Some(true),
active_count: active_count::from_setup(params),
epoch: epoch::from_setup(params),
flate: super::flate::from_setup(params)?,
Ok(SetupOptions {
path,
// A token that cannot be decoded closes the session even where nothing uses it
// (draft-22 section 8.9).
token: super::token::from_setup(&params, version)?,
implementation: crate::setup::decode_implementation(params.get_bytes(ietf::ParameterBytes::Implementation))?,
declared: peer::Peer {
cluster: cluster::peer_from_setup(&params)?,
solicit: solicit::from_setup(&params, version)?,
hidden: hidden::from_setup(&params, version),
max_age: max_age::from_setup(&params, version),
auth: auth::from_setup(&params) == Some(true),
active_count: active_count::from_setup(&params),
epoch: epoch::from_setup(&params),
flate: super::flate::from_setup(&params)?,
},
})
}

Expand Down Expand Up @@ -948,9 +941,9 @@ impl Uni {
reader.set_priority(crate::priority::RECV_CONTROL);
let msg = reader.decode::<setup::Setup>().await?;
if let Some(peer_setup) = peer_setup {
let (declared, implementation) = decode_peer_setup(msg.parameters, version, client)?;
peer_setup.set(declared);
peer_setup.set_implementation(implementation);
let options = decode_peer_setup(&msg.parameters, version, client)?;
peer_setup.set(options.declared);
peer_setup.set_implementation(options.implementation);
}

// Monitor for GOAWAY after setup completes.
Expand Down Expand Up @@ -1396,11 +1389,11 @@ mod tests {
}
params.encode_bytes(version).unwrap()
};
let (_, implementation) = decode_peer_setup(encode(Some(b"moq-net-rs/1")), version, true).unwrap();
assert_eq!(implementation.as_deref(), Some("moq-net-rs/1"));
let (_, implementation) = decode_peer_setup(encode(None), version, true).unwrap();
assert_eq!(implementation, None);
assert!(decode_peer_setup(encode(Some(&[0xff])), version, true).is_err());
let options = decode_peer_setup(&encode(Some(b"moq-net-rs/1")), version, true).unwrap();
assert_eq!(options.implementation.as_deref(), Some("moq-net-rs/1"));
let options = decode_peer_setup(&encode(None), version, true).unwrap();
assert_eq!(options.implementation, None);
assert!(decode_peer_setup(&encode(Some(&[0xff])), version, true).is_err());
}

#[kio::test]
Expand Down
25 changes: 14 additions & 11 deletions rs/moq-net/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -406,18 +406,19 @@ impl Server {
version: ietf::Version,
) -> Result<Handshake, Error> {
let peer_setup = ietf::accept_setup(&mut session, version).await?;
let options = &peer_setup.options;
Ok(Handshake {
path: peer_setup.path.clone(),
path: options.path.clone(),
role: None,
// A moq-transport peer only has an identity if it negotiated the MoQ
// Cluster extension and declared a non-zero Hop ID.
origin: peer_setup.declared.cluster.hop.filter(|h| *h != crate::Hop::UNKNOWN),
token: peer_setup.token.clone(),
peer_implementation: peer_setup.implementation.clone(),
origin: options.declared.cluster.hop.filter(|h| *h != crate::Hop::UNKNOWN),
token: options.token.clone(),
peer_implementation: options.implementation.clone(),
assigned_hop: crate::Hop::random(),
// The client's SETUP already settled whether it offered MoQ Auth, so it is
// negotiated exactly when we offer it too.
auth: crate::auth::Link::ietf(peer_setup.declared.auth && self.extensions.auth),
auth: crate::auth::Link::ietf(options.declared.auth && self.extensions.auth),
inner: Some(RequestInner {
server: self.clone(),
runtime,
Expand Down Expand Up @@ -510,7 +511,7 @@ impl PausedIetf {
} = self;
server.stats.control(stats::Message::Session, peer_setup.size, true);
let (publish, subscribe) = server.stat_tagged_origins();
let peer_implementation = setup::PeerImplementation::known(peer_setup.implementation);
let peer_implementation = setup::PeerImplementation::known(peer_setup.options.implementation);

// The client's SETUP was read at the pause; hand the stream back
// for GOAWAY. A server never advertises a path, hence `None`.
Expand All @@ -531,7 +532,7 @@ impl PausedIetf {
authority: None,
token: None,
peer_setup_stream: Some(peer_setup.stream),
peer_declared: Some(peer_setup.declared),
peer_declared: Some(peer_setup.options.declared),
auth: auth.clone(),
early_unis: peer_setup.early,
extensions: server.extensions,
Expand Down Expand Up @@ -1521,10 +1522,12 @@ mod tests {
Version::Ietf(version),
),
size: 0,
path: None,
token: None,
implementation: None,
declared: ietf::peer::Peer::default(),
options: ietf::SetupOptions {
path: None,
token: None,
implementation: None,
declared: ietf::peer::Peer::default(),
},
early: Vec::new(),
},
}),
Expand Down