Skip to content

fix: validate duplicate track_alias in recv_subscribe_ok #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mondain wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: validate duplicate track_alias in recv_subscribe_ok #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions moq-transport/src/session/subscriber.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,22 @@ impl Subscriber {
/// Handle the reception of a SubscribeOk message from the publisher.
fn recv_subscribe_ok(&mut self, msg: &message::SubscribeOk) -> Result<(), SessionError> {
if let Some(subscribe) = self.subscribes.lock().unwrap().get_mut(&msg.id) {
// Map track alias to subscription id for quick lookup when receiving streams/datagrams
self.subscribe_alias_map
.lock()
.unwrap()
.insert(msg.track_alias, msg.id);
// Check for duplicate track alias - per spec, if the track_alias is already
// in use for a different subscription, we must close the session
{
let mut alias_map = self.subscribe_alias_map.lock().unwrap();
if let Some(&existing_id) = alias_map.get(&msg.track_alias) {
if existing_id != msg.id {
log::error!(
"Duplicate track_alias={} received: already mapped to subscribe_id={}, new subscribe_id={}",
msg.track_alias, existing_id, msg.id
);
return Err(SessionError::Duplicate);
}
}
// Map track alias to subscription id for quick lookup when receiving streams/datagrams
alias_map.insert(msg.track_alias, msg.id);
}

// Notify waiting tasks that the alias map has been updated
self.subscribe_alias_notify.notify_waiters();
Expand Down