fix: avoid panic when validating mapped listeners (#2153)

This commit is contained in:
datayurei
2026-04-25 17:45:57 +08:00
committed by GitHub
parent 5a1668c753
commit af6b6ab6f1
6 changed files with 297 additions and 52 deletions
+52
View File
@@ -108,6 +108,58 @@ pub fn create_netns(name: &str, ipv4: &str, ipv6: &str) {
}
}
pub struct TestNetnsGuard {
name: String,
host_ipv4: Option<String>,
}
impl TestNetnsGuard {
fn run_ip(args: &[&str]) {
let status = std::process::Command::new("ip")
.args(args)
.status()
.unwrap();
assert!(status.success(), "ip command failed: {:?}", args);
}
pub fn new(name: &str, guest_ipv4: &str, guest_ipv6: &str) -> Self {
del_netns(name);
create_netns(name, guest_ipv4, guest_ipv6);
Self {
name: name.to_string(),
host_ipv4: None,
}
}
pub fn set_host_ipv4(&mut self, host_ipv4: &str) {
Self::run_ip(&[
"addr",
"add",
host_ipv4,
"dev",
get_host_veth_name(&self.name),
]);
self.host_ipv4 = Some(host_ipv4.to_string());
}
}
impl Drop for TestNetnsGuard {
fn drop(&mut self) {
if let Some(host_ipv4) = self.host_ipv4.as_deref() {
let _ = std::process::Command::new("ip")
.args([
"addr",
"del",
host_ipv4,
"dev",
get_host_veth_name(&self.name),
])
.status();
}
del_netns(&self.name);
}
}
pub fn prepare_bridge(name: &str) {
// del bridge with brctl
let _ = std::process::Command::new("brctl")
+96
View File
@@ -258,6 +258,102 @@ pub async fn drop_insts(insts: Vec<Instance>) {
while set.join_next().await.is_some() {}
}
mod direct_connector_mapped_listener_tests {
use std::sync::Arc;
use crate::{
common::{
config::{ConfigLoader, TomlConfigLoader},
global_ctx::GlobalCtx,
stun::MockStunInfoCollector,
},
connector::direct::DirectConnectorManager,
instance::listeners::ListenerManager,
peers::{
create_packet_recv_chan,
peer_manager::{PeerManager, RouteAlgoType},
tests::{
connect_peer_manager, create_mock_peer_manager, wait_route_appear,
wait_route_appear_with_cost,
},
},
proto::{common::NatType, peer_rpc::GetIpListResponse},
tests::TestNetnsGuard,
};
async fn create_mock_peer_manager_in_netns(netns: &str) -> Arc<PeerManager> {
let (s, _r) = create_packet_recv_chan();
let config = TomlConfigLoader::default();
config.set_netns(Some(netns.to_owned()));
let global_ctx = Arc::new(GlobalCtx::new(config));
global_ctx.replace_stun_info_collector(Box::new(MockStunInfoCollector {
udp_nat_type: NatType::Unknown,
}));
let peer_mgr = Arc::new(PeerManager::new(RouteAlgoType::Ospf, global_ctx, s));
peer_mgr.run().await.unwrap();
peer_mgr
}
async fn run_direct_connector_mapped_listener_without_port_test(
mapped_listener: &str,
listener: &str,
) {
let ns_name = "dmlp";
let mut _ns = TestNetnsGuard::new(ns_name, "10.199.0.2/24", "fd99::2/64");
_ns.set_host_ipv4("10.199.0.1/24");
let p_a = create_mock_peer_manager().await;
let p_b = create_mock_peer_manager().await;
let p_c = create_mock_peer_manager_in_netns(ns_name).await;
connect_peer_manager(p_a.clone(), p_b.clone()).await;
connect_peer_manager(p_b.clone(), p_c.clone()).await;
wait_route_appear(p_a.clone(), p_c.clone()).await.unwrap();
let mut f = p_a.get_global_ctx().get_flags();
f.bind_device = false;
p_a.get_global_ctx().set_flags(f);
p_c.get_global_ctx()
.config
.set_mapped_listeners(Some(vec![mapped_listener.parse().unwrap()]));
p_c.get_global_ctx()
.config
.set_listeners(vec![listener.parse().unwrap()]);
let mut lis_c = ListenerManager::new(p_c.get_global_ctx(), p_c.clone());
lis_c.prepare_listeners().await.unwrap();
lis_c.run().await.unwrap();
tokio::time::sleep(std::time::Duration::from_secs(1)).await;
let dm_a = DirectConnectorManager::new(p_a.get_global_ctx(), p_a.clone());
let mut ip_list = GetIpListResponse::default();
ip_list.listeners.push(mapped_listener.parse().unwrap());
dm_a.try_direct_connect_with_ip_list(p_c.my_peer_id(), ip_list)
.await
.unwrap();
wait_route_appear_with_cost(p_a.clone(), p_c.my_peer_id(), Some(1))
.await
.unwrap();
}
#[rstest::rstest]
#[tokio::test]
#[serial_test::serial]
async fn direct_connector_mapped_listener_without_port(
#[values(
("tcp://10.199.0.2", "tcp://0.0.0.0:11010"),
("ws://10.199.0.2", "ws://0.0.0.0:80"),
("wss://10.199.0.2", "wss://0.0.0.0:443")
)]
case: (&str, &str),
) {
run_direct_connector_mapped_listener_without_port_test(case.0, case.1).await;
}
}
async fn ping_test(from_netns: &str, target_ip: &str, payload_size: Option<usize>) -> bool {
let _g = NetNS::new(Some(ROOT_NETNS_NAME.to_owned())).guard();
let code = tokio::process::Command::new("ip")