Skip to content
Merged
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
98 changes: 95 additions & 3 deletions src/session/conn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,8 @@ impl Conn {
Some(auth_cb) if !auth_cb(self.conn_id, &so) => return Ok(()),
None if self.on_publish_cb.is_some()
|| self.on_play_cb.is_some()
|| self.on_media_cb.is_some() =>
|| self.on_media_cb.is_some()
|| self.on_frame_cb.is_some() =>
{
return Ok(());
}
Expand Down Expand Up @@ -1710,7 +1711,9 @@ impl Conn {
);
}
if self.on_publish_cb.is_none()
&& (self.on_play_cb.is_some() || self.on_media_cb.is_some())
&& (self.on_play_cb.is_some()
|| self.on_media_cb.is_some()
|| self.on_frame_cb.is_some())
{
return self.send_onstatus(
0,
Expand Down Expand Up @@ -1822,7 +1825,9 @@ impl Conn {
);
}
if self.on_play_cb.is_none()
&& (self.on_publish_cb.is_some() || self.on_media_cb.is_some())
&& (self.on_publish_cb.is_some()
|| self.on_media_cb.is_some()
|| self.on_frame_cb.is_some())
{
return self.send_onstatus(
0,
Expand Down Expand Up @@ -2742,6 +2747,46 @@ mod tests {
);
}

#[test]
fn publish_rejects_frame_only_connections_when_publish_cb_missing() {
let mut conn = Conn::new();
conn.app = "live".to_string();
conn.current_stream = Some(Box::new(Stream::new(1)));
conn.on_frame_cb = Some(|_| {});

let mut publish = Buffer::with_capacity(128);
command::build_publish(&mut publish, "inject", "live").unwrap();
conn.handle_command(publish.as_slice()).unwrap();
assert!(
!conn.current_stream.as_ref().unwrap().is_publishing,
"frame-observing servers must not accept publish without on_publish_cb"
);
assert!(
!conn.relay_enabled,
"relay must stay disabled when publish is rejected on a frame-only server"
);
}

#[test]
fn play_rejects_frame_only_connections_when_play_cb_missing() {
let mut conn = Conn::new();
conn.app = "live".to_string();
conn.current_stream = Some(Box::new(Stream::new(1)));
conn.on_frame_cb = Some(|_| {});

let mut play = Buffer::with_capacity(128);
command::build_play(&mut play, "viewer").unwrap();
conn.handle_command(play.as_slice()).unwrap();
assert!(
!conn.current_stream.as_ref().unwrap().is_playing,
"frame-observing servers must not accept play without on_play_cb"
);
assert!(
!conn.relay_enabled,
"relay must stay disabled when play is rejected on a frame-only server"
);
}

#[test]
fn defer_media_relay_keeps_relay_disabled_without_publish_cb() {
let mut conn = Conn::new();
Expand Down Expand Up @@ -4647,6 +4692,53 @@ mod tests {
);
}

#[test]
fn amf3_shared_object_dropped_when_only_on_frame_cb_configured() {
use crate::message::shared_object::{SharedObjectEvent, SharedObjectEventType};
use std::sync::{LazyLock, Mutex};

static SEEN: LazyLock<Mutex<bool>> = LazyLock::new(|| Mutex::new(false));

fn record_so(_conn_id: u64, _so: &SharedObjectMessage) {
*SEEN.lock().unwrap() = true;
}

*SEEN.lock().unwrap() = false;
let mut conn = Conn::new();
conn.conn_id = 42;
conn.state = ConnState::AppConnected;
conn.on_frame_cb = Some(|_| {});
conn.on_shared_object_cb = Some(record_so);

let so = SharedObjectMessage {
name: "chat".to_string(),
version: 1,
flags: 0,
events: vec![SharedObjectEvent {
event_type: SharedObjectEventType::Change,
data: b"evil".to_vec(),
}],
};
let mut amf_buf = Buffer::with_capacity(64);
shared_object::write(&so, &mut amf_buf).unwrap();
let mut payload = vec![0x00];
payload.extend_from_slice(amf_buf.as_slice());
let msg = ChunkMessage {
csid: 3,
fmt: 0,
timestamp: 0,
msg_length: payload.len() as u32,
msg_type_id: msg_dispatch::RTMP_MSG_AMF3_SHARED_OBJECT,
msg_stream_id: 0,
is_complete: true,
};
conn.handle_message_for_test(&msg, &payload).unwrap();
assert!(
!*SEEN.lock().unwrap(),
"shared objects must not bypass frame-only auth configuration"
);
}

#[test]
fn amf3_shared_object_honors_on_shared_object_auth_cb() {
use crate::message::shared_object::{SharedObjectEvent, SharedObjectEventType};
Expand Down