TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-21 03:40:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

port_forward_mux: pin permission revocation and whole-tunnel failure in tests

Browse Source 
Both already hold; the review asked for them to be stated. `enable-tunnel`
turned off mid-session refuses the next `open` while the live channel
keeps relaying, and a dead tunnel ends every channel on it together,
after which the next accept establishes again on the same `Tunnel`.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EZ49AbZJYfm8NTp5yDPMab
This commit is contained in:
rustdesk
2026-09-04 18:03:17 +08:00
parent 2e75e45588
commit 4584469cd7
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/port_forward_mux.rs
View File

@@ -1311,14 +1311,27 @@ mod tests {
let t = Tunnel::new();
t.claim();
let h = t.set_muxed(ours, NoUi::default());
let (mut app, sock) = local_pair().await;
h.open("localhost", 1, sock, vec![]).unwrap();
let (mut app_a, sock_a) = local_pair().await;
let (mut app_b, sock_b) = local_pair().await;
h.open("localhost", 1, sock_a, vec![]).unwrap();
h.open("localhost", 1, sock_b, vec![]).unwrap();
drop(peer);
// One tunnel is one failure domain: every channel on it ends.
let mut buf = [0u8; 1];
assert_eq!(app.read(&mut buf).await.unwrap(), 0);
assert_eq!(app_a.read(&mut buf).await.unwrap(), 0);
assert_eq!(app_b.read(&mut buf).await.unwrap(), 0);
tokio::time::sleep(std::time::Duration::from_millis(50)).await;
assert!(matches!(t.claim(), Claim::Claimed));
assert!(h.open("localhost", 1, local_pair().await.1, vec![]).is_err());
// The next accept establishes again on the same `Tunnel`.
assert!(matches!(t.claim(), Claim::Claimed));
let (ours, mut peer) = stream_pair().await;
let h = t.set_muxed(ours, NoUi::default());
let (_app_c, sock_c) = local_pair().await;
h.open("localhost", 1, sock_c, vec![]).unwrap();
assert!(matches!(
recv_frame(&mut peer).await.union,
Some(port_forward_channel::Union::Open(_))
));
});
}