diff --git a/src/args_config.rs b/src/args_config.rs index 7c0f4aea..f1e06b97 100644 --- a/src/args_config.rs +++ b/src/args_config.rs @@ -37,6 +37,8 @@ pub struct FileConfig { #[serde(rename = "no_tun", skip_serializing)] pub legacy_no_tun: Option, pub mtu: Option, + /// 隧道 DNS 服务器地址列表(严格 IPv4,主备顺序) + pub dns: Option>, pub ctrl_port: Option, pub port_mapping: Option>, pub allow_mapping: Option, @@ -98,6 +100,7 @@ impl FileConfig { device_mode, legacy_no_tun, mtu, + dns, ctrl_port, port_mapping, allow_mapping, @@ -271,6 +274,9 @@ pub struct Args { /// 设置mtu #[clap(long)] pub mtu: Option, + /// 隧道 DNS 服务器地址,可重复指定;第 1 条主用,其余备用(仅 IPv4) + #[clap(long = "dns")] + pub dns: Vec, /// 控制端口,设置0时禁用控制服务 #[clap(long)] pub ctrl_port: Option, @@ -436,6 +442,13 @@ fn build_from_args_and_file(args: Args, file: FileConfig) -> anyhow::Result<(Con no_nat: args.no_nat || file.no_nat.unwrap_or(false), device_mode: args.device_mode.or(file.device_mode).unwrap_or_default(), mtu: args.mtu.or(file.mtu), + dns: parse_dns_servers( + if args.dns.is_empty() { + file.dns.clone().unwrap_or_default() + } else { + args.dns.clone() + }, + )?, port_mapping, allow_port_mapping: args.allow_mapping || file.allow_mapping.unwrap_or(false), udp_stun, @@ -490,6 +503,7 @@ fn build_from_args_only(args: Args) -> anyhow::Result<(Config, CtrlConfig)> { no_nat: args.no_nat, device_mode: args.device_mode.unwrap_or_default(), mtu: args.mtu, + dns: parse_dns_servers(args.dns.clone())?, port_mapping: args.port_mapping, allow_port_mapping: args.allow_mapping, tunnel_addr, @@ -569,6 +583,7 @@ fn build_from_file_only(file: FileConfig) -> anyhow::Result<(Config, CtrlConfig) no_nat: file.no_nat.unwrap_or(false), device_mode: file.device_mode.unwrap_or_default(), mtu: file.mtu, + dns: parse_dns_servers(file.dns.clone().unwrap_or_default())?, port_mapping, allow_port_mapping: file.allow_mapping.unwrap_or(false), udp_stun, @@ -584,6 +599,23 @@ fn build_from_file_only(file: FileConfig) -> anyhow::Result<(Config, CtrlConfig) Ok((config, ctrl_config)) } +/// 解析并校验隧道 DNS 服务器列表:每条必须是合法 IPv4 点分十进制, +/// 忽略空项。非法地址直接报错(配置层拦截)。返回值按原始顺序保留主备语义。 +fn parse_dns_servers(values: Vec) -> anyhow::Result> { + let mut servers = Vec::with_capacity(values.len()); + for raw in values { + let value = raw.trim(); + if value.is_empty() { + continue; + } + let ip = value.parse::().map_err(|error| { + anyhow::anyhow!("DNS 地址无效:{value}(需为 IPv4 点分十进制):{error}") + })?; + servers.push(ip); + } + Ok(servers) +} + fn resolve_tunnel_binding( cli_addr: &[SocketAddr], cli_port: Option, @@ -718,6 +750,11 @@ server = ["quic://1.2.3.4:29872"] # MTU 设置 # mtu = 1400 +# 网卡 DNS:非空列表会写入虚拟网卡接口 DNS,留空或省略则使用系统 DNS。 +# 第 1 条主用,其余备用。 +# 建议填 VNT 对端(路由器)的隧道 IP,例如 10.26.0.3;每条必须是合法 IPv4。 +# dns = ["10.26.0.3", "223.5.5.5"] + # --- 设备配置 --- # 设备名称 (可选,默认读取本机 hostname) @@ -774,6 +811,59 @@ server = ["quic://1.2.3.4:29872"] mod tests { use super::*; + #[test] + fn dns_list_alone_configures_interface_dns() { + let args = Args::try_parse_from([ + "vnt", + "-n", + "dns-test", + "--device-id", + "dns-test-device", + "--dns", + "10.26.0.3", + "--dns", + "223.5.5.5", + ]) + .unwrap(); + let (config, _) = build_from_args_only(args).unwrap(); + assert_eq!( + config.dns, + vec![ + "10.26.0.3".parse::().unwrap(), + "223.5.5.5".parse().unwrap(), + ] + ); + let file: FileConfig = toml::from_str( + "network_code='dns-test'\ndevice_id='dns-test-device'\nip='10.26.0.2/24'\ndns=[]", + ) + .unwrap(); + assert!(build_from_file_only(file).unwrap().0.dns.is_empty()); + } + + #[test] + fn dns_servers_parse_and_reject_invalid() { + let ok = parse_dns_servers(vec!["10.26.0.3".into(), " 223.5.5.5 ".into(), "".into()]).unwrap(); + assert_eq!(ok, vec!["10.26.0.3".parse::().unwrap(), "223.5.5.5".parse().unwrap()]); + assert!(parse_dns_servers(vec!["999.1.1.1".into()]).is_err()); + assert!(parse_dns_servers(vec!["10.26.0".into()]).is_err()); + assert!(parse_dns_servers(vec!["abc".into()]).is_err()); + } + + #[test] + fn dns_fields_parse_from_file_and_overlay() { + let remote: FileConfig = toml::from_str( + "server=['tcp://remote:29872']\nnetwork_code='n'\ndns=['10.26.0.3']", + ) + .unwrap(); + assert_eq!(remote.dns.as_deref(), Some(&["10.26.0.3".to_string()][..])); + let local: FileConfig = toml::from_str( + "network_code='n'\ndns=['1.1.1.1','8.8.8.8']", + ) + .unwrap(); + let merged = remote.overlay(local); + assert_eq!(merged.dns.as_deref(), Some(&["1.1.1.1".to_string(), "8.8.8.8".to_string()][..])); + } + #[test] fn subscription_uses_sub_cli_flag() { let args = Args::try_parse_from(["vnt", "--sub", "vnt2://join/2/example"]).unwrap(); diff --git a/vnt-core/src/context/config.rs b/vnt-core/src/context/config.rs index 779add6e..316ee3f4 100644 --- a/vnt-core/src/context/config.rs +++ b/vnt-core/src/context/config.rs @@ -557,6 +557,9 @@ pub struct Config { pub no_nat: bool, pub device_mode: DeviceMode, pub mtu: Option, + /// 隧道 DNS 服务器地址列表(严格 IPv4 点分十进制),按顺序即主备顺序, + /// 第 1 条为主用,其余为备用;为空时使用系统 DNS。 + pub dns: Vec, pub port_mapping: Vec, pub allow_port_mapping: bool, pub udp_stun: Vec, @@ -707,6 +710,8 @@ impl Config { if let Some(mtu) = self.mtu { table.insert("mtu".into(), i64::from(mtu).into()); } + // 空列表使用系统 DNS,无需输出。 + insert_string_array(&mut table, "dns", &self.dns); if let Some(tunnel_port) = self.tunnel_port { table.insert("tunnel_port".into(), i64::from(tunnel_port).into()); } @@ -1304,7 +1309,36 @@ mod tests { assert!(!text.contains("rtx"), "{text}"); assert!(!text.contains("no_punch"), "{text}"); assert!(!text.contains("password"), "{text}"); + // 隧道 DNS 默认不输出 + assert!(!text.contains("dns_tunnel"), "{text}"); + assert!(!text.contains("dns ="), "{text}"); // 输出本身是合法 TOML assert!(toml::from_str::(&text).is_ok(), "{text}"); } + + #[test] + fn to_toml_string_emits_dns_without_a_separate_switch() { + let config = Config { + network_code: "net".to_string(), + device_id: "dev".to_string(), + dns: vec![ + Ipv4Addr::new(10, 26, 0, 3), + Ipv4Addr::new(223, 5, 5, 5), + ], + ..Config::default() + }; + let text = config.to_toml_string(); + assert!(!text.contains("dns_tunnel"), "{text}"); + assert!( + text.contains("dns = [\"10.26.0.3\", \"223.5.5.5\"]"), + "{text}" + ); + assert!(toml::from_str::(&text).is_ok(), "{text}"); + } + + #[test] + fn tunnel_dns_defaults_to_system_dns() { + let config = Config::default(); + assert!(config.dns.is_empty()); + } } diff --git a/vnt-core/src/core/change_runtime.rs b/vnt-core/src/core/change_runtime.rs index 1a5dc4c2..983c01a8 100644 --- a/vnt-core/src/core/change_runtime.rs +++ b/vnt-core/src/core/change_runtime.rs @@ -57,6 +57,13 @@ impl NetworkManager { let mtu_change = change.config.mtu.is_some() && change.config.mtu != self.config.mtu; #[cfg(any(target_os = "android", target_os = "ios", target_os = "tvos"))] let mtu_change = false; + // 桌面平台隧道 DNS 可热更新(接口 DNS);移动平台 DNS 由宿主 VPN + // 接口决定,归 needs_device_restart/needs_vpn_rebuild 覆盖 + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + let dns_change = change.config.dns != self.config.dns + || (self.device_mode().has_device() && self.device_io_manager.dns_update_pending()); + #[cfg(any(target_os = "android", target_os = "ios", target_os = "tvos"))] + let dns_change = false; // Windows/Linux/FreeBSD 支持网卡名热变更(tun-rs set_name); // 恢复默认名(None)无法热应用,归 needs_device_restart 走重建 #[cfg(any(windows, target_os = "linux", target_os = "freebsd"))] @@ -64,7 +71,7 @@ impl NetworkManager { change.config.tun_name.is_some() && change.config.tun_name != self.config.tun_name; #[cfg(not(any(windows, target_os = "linux", target_os = "freebsd")))] let name_change = false; - structural_change || mtu_change || name_change + structural_change || mtu_change || dns_change || name_change } /// 判断快照是否包含只能通过重建实例生效的字段:password/cert_mode、 @@ -259,6 +266,10 @@ impl NetworkManager { // MTU 热更新:桌面平台 tun-rs 支持动态修改,无需重建设备 let mtu = change.config.mtu.or(self.config.mtu).unwrap_or(DEFAULT_MTU); self.device_io_manager.set_mtu(mtu).await?; + // 列表为空时清空接口 DNS,恢复系统解析。 + if let Err(error) = self.device_io_manager.set_dns(&change.config.dns).await { + log::warn!("应用隧道 DNS 失败,保留待重试状态: {error:#}"); + } // 网卡名热更新:Windows/Linux/FreeBSD 由 tun-rs 支持,无需重建 #[cfg(any(windows, target_os = "linux", target_os = "freebsd"))] if let Some(tun_name) = &change.config.tun_name { @@ -326,6 +337,8 @@ impl NetworkManager { if let Some(tun_name) = change.config.tun_name.clone() { config = config.set_tun_name(tun_name); } + // 重建网卡同样按当前生效配置应用隧道 DNS。 + config = config.set_dns(change.config.dns.clone()); Ok(config) } @@ -575,6 +588,7 @@ impl NetworkManager { address.is_some() || (change.config.mtu.is_some() && change.config.mtu != self.config.mtu) || change.config.tun_name != self.config.tun_name + || change.config.dns != self.config.dns || normalized_routes(self.app_state.subnet_route.applied_routes()) != normalized_routes(change.routes.clone()) } @@ -607,7 +621,7 @@ impl NetworkManager { (desired, address) } - /// 提交路由快照,并把配置中影响路由的字段(`ip`、`input`)应用到实例。 + /// 提交路由与 DNS 快照,并发布当前配置,供桌面和移动平台共用。 fn commit_runtime_snapshot(&mut self, change: &RuntimeChange) { self.app_state .subnet_route @@ -618,8 +632,10 @@ impl NetworkManager { self.app_state .subnet_route .set_route_table(change.config.input.clone()); - self.app_state.set_config(self.config.clone()); } + self.config.dns = change.config.dns.clone(); + // DNS 单独变化时也必须更新 API 读取的共享配置。 + self.app_state.set_config(self.config.clone()); } } @@ -686,13 +702,52 @@ fn instance_rebuild_fields_differ(current: &Config, target: &Config) -> bool { allow(dead_code) )] fn device_restart_fields_differ(current: &Config, target: &Config) -> bool { - current.mtu != target.mtu || current.tun_name != target.tun_name + current.mtu != target.mtu + || current.tun_name != target.tun_name + || current.dns != target.dns } #[cfg(test)] mod tests { use super::*; + #[tokio::test] + async fn committed_dns_snapshot_does_not_require_another_device_rebuild() { + let owner = crate::utils::task_control::TaskGroupManager::new(); + let (group, _guard) = owner.create_task().unwrap(); + let (routes, _receiver) = tokio::sync::watch::channel(Vec::new()); + let mut manager = NetworkManager::create_network( + Box::new(Config { + network_code: "dns-snapshot-test".to_string(), + device_id: "dns-snapshot-device".to_string(), + device_mode: crate::context::config::DeviceMode::Tun, + ip: Some("10.26.0.2/24".parse().unwrap()), + ..Config::default() + }), + group, + std::sync::Arc::new(crate::log_manager::InstanceLog::new("dns-snapshot-test")), + routes, + ) + .await + .unwrap(); + let mut change = RuntimeChange { + config: (*manager.config).clone(), + routes: Vec::new(), + }; + change.config.dns = vec!["10.26.0.3".parse().unwrap()]; + assert!(device_restart_fields_differ( + &manager.config, + &change.config + )); + manager.commit_runtime_snapshot(&change); + assert!(!device_restart_fields_differ( + &manager.config, + &change.config + )); + assert_eq!(manager.config.dns, change.config.dns); + manager.stop().await; + } + #[test] fn policy_field_changes_are_detected() { let current = Config::default(); diff --git a/vnt-core/src/core/mod.rs b/vnt-core/src/core/mod.rs index 98d5aed3..12bafdcc 100644 --- a/vnt-core/src/core/mod.rs +++ b/vnt-core/src/core/mod.rs @@ -719,6 +719,8 @@ impl NetworkManager { if let Some(tun_name) = self.config.tun_name.clone() { config = config.set_tun_name(tun_name); } + // 隧道 DNS:建卡时按当前生效配置应用接口 DNS(桌面平台)。 + config = config.set_dns(self.config.dns.clone()); // 失败时 tun_receiver/enhanced_outbound 不会被消耗,可以重试 if let Err(e) = self .device_io_manager @@ -789,6 +791,14 @@ impl NetworkManager { .await?; #[cfg(not(any(target_os = "ios", target_os = "tvos")))] self.device_io_manager.apply_system_routes(routes).await; + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + if let Err(error) = self + .device_io_manager + .set_dns(&self.config.dns) + .await + { + log::warn!("应用隧道 DNS 失败,保留待重试状态: {error:#}"); + } } Ok(()) } @@ -884,6 +894,36 @@ mod inspect_change_tests { } } + #[tokio::test] + async fn dns_only_changes_publish_current_config() { + let mut config = standalone_config(); + let mut manager = RuntimeChangeManager::new( + config.clone(), + None, + Arc::new(InstanceLog::new("dns-change-test")), + ) + .await + .unwrap(); + for addresses in [ + vec!["10.26.0.3", "223.5.5.5"], + vec!["10.26.0.4"], + vec![], + ] { + config.dns = addresses + .iter() + .map(|address| address.parse().unwrap()) + .collect(); + let change = RuntimeChange { + config: config.clone(), + routes: Vec::new(), + }; + manager.apply_change(&change).await.unwrap(); + let published = manager.api().unwrap().get_config().unwrap(); + assert_eq!(published.dns, config.dns); + } + manager.stop().await; + } + #[tokio::test] async fn identical_snapshot_needs_nothing_and_password_flags_rebuild() { let config = standalone_config(); diff --git a/vnt-core/src/managed_config.rs b/vnt-core/src/managed_config.rs index 4adaae9c..769008c1 100644 --- a/vnt-core/src/managed_config.rs +++ b/vnt-core/src/managed_config.rs @@ -505,6 +505,7 @@ fn parse_envelope_config(update: &SubscriptionConfigEnvelope) -> EnvelopeConfig server_addr: parse_envelope_servers(&table), mtu: parse_envelope_u16(&table, "mtu"), tun_name: parse_envelope_string(&table, "tun_name").filter(|name| !name.is_empty()), + dns: parse_typed_list(&table, "dns"), // 策略类字段:出现即可由 apply_policy_change 热应用 compress: parse_envelope_bool(&table, "compress"), rtx: parse_envelope_bool(&table, "rtx"), @@ -729,6 +730,43 @@ pub fn constant_time_eq(left: &[u8], right: &[u8]) -> bool { mod tests { use super::*; + #[test] + fn subscription_dns_fields_preserve_order_and_explicit_defaults() { + let local = Config { + dns: vec!["192.168.1.1".parse().unwrap()], + ..Config::default() + }; + for (toml, addresses) in [ + ( + "dns=['10.26.0.3','223.5.5.5']", + vec!["10.26.0.3", "223.5.5.5"], + ), + ("dns=[]", vec![]), + ("", vec!["192.168.1.1"]), + ( + "dns=['10.26.0.3','invalid','::1','223.5.5.5']", + vec!["10.26.0.3", "223.5.5.5"], + ), + ] { + let mut update = envelope(1); + update.toml = toml.to_string(); + let parsed = parse_envelope_config(&update); + let merged = crate::network_info::merge_present_config( + local.clone(), + &parsed.config, + &parsed.present, + ); + assert_eq!( + merged.dns, + addresses + .iter() + .map(|address| address.parse::().unwrap()) + .collect::>(), + "{toml}" + ); + } + } + fn envelope(revision: u64) -> SubscriptionConfigEnvelope { SubscriptionConfigEnvelope { revision, diff --git a/vnt-core/src/network_info.rs b/vnt-core/src/network_info.rs index cf519362..27f3dabd 100644 --- a/vnt-core/src/network_info.rs +++ b/vnt-core/src/network_info.rs @@ -52,6 +52,7 @@ pub fn merge_present_config( // 网卡类(桌面热应用 / 移动重建) overlay!("mtu", mtu); overlay!("tun_name", tun_name); + overlay!("dns", dns); // 策略类(apply_policy_change 热应用) overlay!("peer_address", peer_address); overlay!("turn", turn); diff --git a/vnt-core/src/tun/general.rs b/vnt-core/src/tun/general.rs index e92282f0..c00eecd3 100644 --- a/vnt-core/src/tun/general.rs +++ b/vnt-core/src/tun/general.rs @@ -23,6 +23,8 @@ pub struct DeviceIOManager { task_group: TaskGroup, device: DeviceMutex, #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + dns_update_pending: Arc, + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] applied_system_routes: Arc>>, } @@ -35,6 +37,8 @@ struct DeviceState { network: Option<(Ipv4Addr, u8)>, mtu: Option, tun_name: Option, + /// 当前已应用到网卡接口的隧道 DNS 服务器(主备顺序)。 + dns: Option>, #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] ipv6_routes: Option, /// 虚拟 IPv6 配置失败后跳过后续尝试,网卡重建后重新检测。 @@ -71,6 +75,9 @@ pub struct DeviceConfig { pub tun_fd: Option, pub mtu: Option, pub mac_addr: Option<[u8; 6]>, + /// 建卡时需应用到本网卡接口的隧道 DNS 服务器(已过滤为合法 IPv4)。 + /// 为空表示不设置接口 DNS,沿用物理网卡/系统 DNS。 + pub dns: Vec, } impl DeviceConfig { @@ -95,7 +102,13 @@ impl DeviceConfig { self.mac_addr = Some(mac_addr); self } + /// 设置建卡时应用的隧道 DNS 服务器列表(主备顺序)。 + pub fn set_dns(mut self, dns: Vec) -> Self { + self.dns = dns; + self + } } + #[derive(Clone)] pub struct TunInbound { pub(crate) sender: Sender, @@ -115,6 +128,8 @@ impl DeviceIOManager { task_group, device: Arc::new(Default::default()), #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + dns_update_pending: Arc::new(AtomicBool::new(false)), + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] applied_system_routes: Arc::new(tokio::sync::Mutex::new(None)), } } @@ -136,6 +151,8 @@ impl DeviceIOManager { let device_mode = device_config.device_mode; let mtu = device_config.mtu; let tun_name = device_config.tun_name.clone(); + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + let dns = device_config.dns.clone(); let device = Arc::new(create_device(device_config)?); let Some(receiver_value) = receiver.take() else { bail!("device task already started"); @@ -162,6 +179,12 @@ impl DeviceIOManager { }); state.mtu = mtu; state.tun_name = tun_name; + state.dns = None; + drop(state); + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + if let Err(error) = self.set_dns(&dns).await { + log::warn!("应用隧道 DNS 失败,将在网络状态应用时重试: {error:#}"); + } Ok(()) } @@ -332,7 +355,38 @@ impl DeviceIOManager { Ok(()) } - /// 用宿主(VpnService)提供的 fd 替换运行中的虚拟网卡任务。Android + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + pub(crate) fn dns_update_pending(&self) -> bool { + self.dns_update_pending.load(Ordering::Acquire) + } + + /// 仅在 DNS 完整应用成功后更新缓存,失败时保留待重试状态。 + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + pub async fn set_dns(&self, servers: &[Ipv4Addr]) -> anyhow::Result<()> { + let mut guard = self.device.lock().await; + self.dns_update_pending.store(true, Ordering::Release); + let Some(task) = guard + .runtime + .as_ref() + .and_then(|runtime| runtime.task.as_ref()) + else { + bail!("虚拟网卡尚未启动") + }; + #[cfg(windows)] + let alias = task.device.name()?; + #[cfg(not(windows))] + let _ = task; + apply_dns_update(&mut guard.dns, servers, || { + #[cfg(windows)] + apply_interface_dns(&alias, servers)?; + #[cfg(not(windows))] + log::debug!("当前平台暂不支持设置虚拟网卡接口 DNS,跳过(仅 Windows)"); + Ok(()) + })?; + self.dns_update_pending.store(false, Ordering::Release); + Ok(()) + } + /// 专用:tun-rs 在该平台不支持 set_network_address,因此地址不通过 /// set_network 应用,而是随新任务一并写入 [`DeviceState`]。 #[cfg(target_os = "android")] @@ -368,6 +422,8 @@ impl DeviceIOManager { bail!("无虚拟网卡模式没有可重启的任务"); } let mtu = device_config.mtu; + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + let dns = device_config.dns.clone(); // 先创建新设备:创建失败时不影响当前任务 let replacement_device = Arc::new(create_device(device_config)?); self.swap_running_device(replacement_device, DeviceStateUpdate { network: None, mtu }) @@ -376,6 +432,10 @@ impl DeviceIOManager { // 清理旧接口路由),下次应用路由时按新接口重建。 #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] self.clear_applied_system_routes().await; + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + if let Err(error) = self.set_dns(&dns).await { + log::warn!("重建网卡后应用隧道 DNS 失败,保留待重试状态: {error:#}"); + } Ok(()) } @@ -450,6 +510,9 @@ impl DeviceIOManager { state.ipv6_routes = None; } state.mtu = update.mtu; + state.dns = None; + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + self.dns_update_pending.store(true, Ordering::Release); // Dropping the old task after the new one is live closes its fd. drop(old_task); return Ok(()); @@ -575,6 +638,92 @@ fn device_creation_error_context(mode: DeviceMode, error: &io::Error) -> &'stati DeviceMode::Tun | DeviceMode::No => "创建 TUN 失败", } } +/// 仅缓存完整成功的 DNS 更新;失败可能已部分修改网卡,必须使旧缓存失效。 +#[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] +fn apply_dns_update( + applied: &mut Option>, + servers: &[Ipv4Addr], + apply: impl FnOnce() -> anyhow::Result<()>, +) -> anyhow::Result<()> { + if applied.as_deref() == Some(servers) { + return Ok(()); + } + *applied = None; + apply()?; + *applied = Some(servers.to_vec()); + Ok(()) +} + +/// 向指定虚拟网卡应用隧道 DNS 服务器。按接口别名(网卡名)通过 `netsh` +/// 设置该接口的静态 DNS 服务器列表:第 1 条为主用(`primary`),其余依次 +/// `add` 为备用。`servers` 为空表示清空接口 DNS(恢复按 DHCP/系统解析)。 +/// +/// 仅 Windows 实现(采用 netsh 而非 IP Helper API:winapi 0.3 未导出 +/// `SetInterfaceDnsSettings`,netsh 语义等价、随系统自带,无需额外依赖)。 +/// 其他平台不调用本函数:移动平台由宿主 VPN 接口(VpnService)配置 DNS, +/// 其他桌面平台为无操作。 +#[cfg(windows)] +fn apply_interface_dns(alias: &str, servers: &[Ipv4Addr]) -> anyhow::Result<()> { + if alias.trim().is_empty() { + anyhow::bail!("虚拟网卡名为空,无法设置接口 DNS"); + } + apply_interface_dns_windows(alias, servers) +} + +#[cfg(windows)] +fn apply_interface_dns_windows(alias: &str, servers: &[Ipv4Addr]) -> anyhow::Result<()> { + use std::process::Command; + + // 清空接口 DNS(无服务器时也走这里,恢复系统解析)。 + let run = |args: &[&str]| -> anyhow::Result<()> { + let output = Command::new("netsh") + .args(args) + .output() + .map_err(|error| anyhow::anyhow!("执行 netsh 失败: {error}"))?; + if !output.status.success() { + let stderr = String::from_utf8_lossy(&output.stderr); + let stdout = String::from_utf8_lossy(&output.stdout); + anyhow::bail!("netsh {args:?} 失败: {stdout}{stderr}"); + } + Ok(()) + }; + + if servers.is_empty() { + // 恢复为 DHCP 自动获取的 DNS(清空静态配置)。 + run(&["interface", "ip", "set", "dns", alias, "dhcp"])?; + return Ok(()); + } + // 不进行联网校验:DNS 对端可能尚未上线,地址格式已由配置层校验。 + // 第一条:主用(会覆盖旧静态配置)。 + run(&[ + "interface", + "ip", + "set", + "dns", + alias, + "static", + &servers[0].to_string(), + "primary", + "validate=no", + ])?; + // 其余:追加为备用(index 递增)。 + for (index, server) in servers.iter().enumerate().skip(1) { + run(&[ + "interface", + "ip", + "add", + "dns", + alias, + &server.to_string(), + &format!("index={}", index + 1), + "validate=no", + ])?; + } + // 刷新 DNS 缓存(失败仅记录,不影响接口建立)。 + let _ = Command::new("ipconfig").arg("/flushdns").output(); + Ok(()) +} + fn create( task_group: &TaskGroup, device: Arc, @@ -709,6 +858,49 @@ impl Encoder for BytesCodec { mod tests { use super::*; + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + #[tokio::test] + async fn dns_failure_remains_pending_for_a_later_network_snapshot() { + let owner = crate::utils::task_control::TaskGroupManager::new(); + let (group, _guard) = owner.create_task().unwrap(); + let manager = DeviceIOManager::new(group); + assert!(!manager.dns_update_pending()); + assert!( + manager + .set_dns(&[Ipv4Addr::new(10, 26, 0, 3)]) + .await + .is_err() + ); + assert!(manager.dns_update_pending()); + } + + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + #[test] + fn failed_dns_update_can_retry_or_restore_previous_servers() { + let first = vec![Ipv4Addr::new(10, 26, 0, 3)]; + let second = vec![Ipv4Addr::new(10, 26, 0, 4)]; + let mut applied = None; + // A failed startup attempt must not suppress an identical retry. + assert!(apply_dns_update(&mut applied, &first, || anyhow::bail!("netsh failed")).is_err()); + assert!(applied.is_none()); + apply_dns_update(&mut applied, &first, || Ok(())).unwrap(); + apply_dns_update(&mut applied, &first, || panic!("already applied")).unwrap(); + // A partial update can invalidate even the previously successful list. + assert!( + apply_dns_update(&mut applied, &second, || anyhow::bail!("partial update")).is_err() + ); + assert!(applied.is_none()); + let mut restored = false; + apply_dns_update(&mut applied, &first, || { + restored = true; + Ok(()) + }) + .unwrap(); + assert!(restored); + apply_dns_update(&mut applied, &[], || Ok(())).unwrap(); + assert_eq!(applied, Some(Vec::new())); + } + #[test] fn permission_denied_suggests_running_as_administrator() { let error = io::Error::new(io::ErrorKind::PermissionDenied, "access denied"); diff --git a/vnt-core/src/utils/socket.rs b/vnt-core/src/utils/socket.rs index 4a581712..d6f76940 100644 --- a/vnt-core/src/utils/socket.rs +++ b/vnt-core/src/utils/socket.rs @@ -30,16 +30,14 @@ pub(crate) fn resolve_interface(name: Option<&str>) -> anyhow::Result( "device_name": change.config.device_name, "ip": change.config.ip.as_ref().map(ToString::to_string), "mtu": change.config.mtu, + "dns": change.config.dns.iter().map(ToString::to_string).collect::>(), }, "routes": change.routes, "needs_vpn_rebuild": plan.vpn_rebuild, @@ -1377,6 +1378,8 @@ fn parse_config_from_json(json_str: &str, managed: bool) -> anyhow::Result, #[serde(default)] + dns: Vec, + #[serde(default)] port_mapping: Vec, #[serde(default)] allow_mapping: bool, @@ -1482,6 +1485,18 @@ fn parse_config_from_json(json_str: &str, managed: bool) -> anyhow::Result().map_err(|error| { + anyhow::anyhow!("invalid DNS address '{}': {}", value, error) + })?); + } + let config = Config { server_addr: server_addrs, peer_address, @@ -1508,6 +1523,7 @@ fn parse_config_from_json(json_str: &str, managed: bool) -> anyhow::Result, pub mtu: Option, + /// 隧道 DNS 服务器地址列表(严格 IPv4,主备顺序) + #[serde(default)] + pub dns: Vec, #[serde(default)] pub port_mapping: Vec, #[serde(default)] @@ -508,6 +511,7 @@ impl StartConfig { bail!("configuration key 'no_tun' was removed; use device_mode = \"no|tun|tap\"") } validate_tunnel_binding(&self.tunnel_addr, self.tunnel_port)?; + parse_dns_servers(&self.dns)?; Ok(()) } @@ -805,6 +809,8 @@ struct HttpAppInfo { public_ipv4s: Vec, network_code: Option, mtu: Option, + /// 网卡 DNS 服务器列表(主备顺序),为空时使用系统 DNS。 + dns: Vec, fec: Option, compress: Option, encrypt: Option, @@ -1978,6 +1984,10 @@ async fn get_info( public_ipv6: nat_info.as_ref().and_then(|v| v.ipv6), network_code: config.as_ref().map(|v| v.network_code.clone()), mtu: config.as_ref().map(|v| v.mtu.unwrap_or(DEFAULT_MTU)), + dns: config + .as_ref() + .map(|v| v.dns.clone()) + .unwrap_or_default(), fec: config.as_ref().map(|v| v.fec), compress: config.as_ref().map(|v| v.compress), encrypt: config.as_ref().map(|v| v.password.is_some()), @@ -2384,6 +2394,23 @@ async fn save_config(Json(req): Json) -> Json> { } } + if subscription.is_some() { + // 订阅配置不要求本地提供身份/IP,但本地 DNS 仍需与启动时同样校验。 + let dns = table + .get("dns") + .cloned() + .unwrap_or(toml::Value::Array(Vec::new())); + let validated = dns + .try_into::>() + .map_err(anyhow::Error::from) + .and_then(|values| parse_dns_servers(&values)); + if let Err(error) = validated { + return Json(ApiResponse::error(format!( + "Invalid DNS configuration: {error}" + ))); + } + } + let file_name = req .file_name .filter(|name| !name.is_empty()) @@ -2479,6 +2506,19 @@ async fn delete_config( } } +fn parse_dns_servers(values: &[String]) -> anyhow::Result> { + values + .iter() + .map(|value| value.trim()) + .filter(|value| !value.is_empty()) + .map(|value| { + value + .parse::() + .map_err(|error| anyhow!("invalid DNS address '{}': {}", value, error)) + }) + .collect() +} + fn convert_config(cfg: StartConfig) -> anyhow::Result { // 只做基础校验:服务器/虚拟 IP 的要求由调用方按订阅与否决定 // (订阅模式下二者来自服务端首份配置),最终以合并后配置的 @@ -2563,6 +2603,7 @@ fn convert_config(cfg: StartConfig) -> anyhow::Result { x.push_str(":3478"); } } + let dns = parse_dns_servers(&cfg.dns)?; Ok(CoreConfig { server_addr: server_addrs, peer_address, @@ -2589,6 +2630,7 @@ fn convert_config(cfg: StartConfig) -> anyhow::Result { no_nat: cfg.no_nat, device_mode: cfg.device_mode, mtu: cfg.mtu, + dns, port_mapping, allow_port_mapping: cfg.allow_mapping, udp_stun, @@ -2855,6 +2897,39 @@ async fn get_routes( #[cfg(test)] mod tests { + #[test] + fn dns_save_validation_matches_startup() { + for value in ["invalid", "010.26.0.3", "256.0.0.1", "::1"] { + let mut config = new_test_config(); + config.dns = vec![value.to_string()]; + assert!(config.validate().is_err(), "{value}"); + assert!(convert_config(config).is_err(), "{value}"); + } + let mut config = new_test_config(); + config.dns = vec![" 10.26.0.3 ".into(), "".into(), "223.5.5.5".into()]; + config.validate().unwrap(); + assert_eq!( + convert_config(config).unwrap().dns, + vec![ + "10.26.0.3".parse::().unwrap(), + "223.5.5.5".parse().unwrap() + ] + ); + } + + #[tokio::test] + async fn subscription_save_rejects_invalid_local_dns_before_writing() { + // Local fixture: a syntactically valid subscription using a dummy credential. + let link = "vnt2://join/2/eyJ2IjoyLCJzZXJ2ZXIiOiJ0Y3A6Ly8xMjcuMC4wLjE6Mjk4NzIiLCJjZXJ0X21vZGUiOiJzdGFuZGFyZCIsImpvaW5faWQiOiIxMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUiLCJjcmVkZW50aWFsX2tleSI6IkJ3Y0hCd2NIQndjSEJ3Y0hCd2NIQndjSEJ3Y0hCd2NIQndjSEJ3Y0hCd2MifQ"; + let response = save_config(Json(SaveConfigReq { + file_name: None, + config: format!("subscription = '{link}'\ndns = ['010.26.0.3']"), + })) + .await; + assert!(response.0.data.is_none()); + assert!(response.0.msg.contains("invalid DNS address")); + } + use super::*; #[tokio::test] @@ -3125,6 +3200,7 @@ config_name = "local-label" device_mode: DeviceMode::No, legacy_no_tun: None, mtu: None, + dns: Vec::new(), port_mapping: Vec::new(), allow_mapping: false, udp_stun: Vec::new(), diff --git a/vnt-web/ui/src/utils/configHelp.js b/vnt-web/ui/src/utils/configHelp.js index fa0dde09..db80afba 100644 --- a/vnt-web/ui/src/utils/configHelp.js +++ b/vnt-web/ui/src/utils/configHelp.js @@ -68,6 +68,13 @@ export const configHelp = { format: "正整数,常用范围 1200–1500;留空使用默认值。", example: "1380", }, + dns: { + param: "dns", + summary: "虚拟网卡 DNS 服务器地址列表(主备顺序)。", + usage: "填写后按顺序写入虚拟网卡接口 DNS,第 1 条主用、其余备用。清空列表使用系统 DNS。建议填 VNT 对端(路由器)的隧道 IP(如 10.26.0.3)。", + format: "IPv4 点分十进制地址数组;每条 0–255,非法地址保存时会被拒绝。", + example: '["10.26.0.3", "223.5.5.5"]', + }, tunnel_addr: { param: "tunnel_addr / --tunnel-addr", summary: "指定本机监听 P2P 隧道的 IP 和端口。", diff --git a/vnt-web/ui/src/utils/ipv4.js b/vnt-web/ui/src/utils/ipv4.js new file mode 100644 index 00000000..b56eaddd --- /dev/null +++ b/vnt-web/ui/src/utils/ipv4.js @@ -0,0 +1,8 @@ +// Match Rust's Ipv4Addr parser: four decimal octets, with no leading zeroes. +export const isValidIpv4 = (value) => { + if (typeof value !== "string") return false; + const parts = value.trim().split("."); + return parts.length === 4 && parts.every( + (part) => /^(0|[1-9]\d{0,2})$/.test(part) && Number(part) <= 255, + ); +}; diff --git a/vnt-web/ui/src/utils/ipv4.test.js b/vnt-web/ui/src/utils/ipv4.test.js new file mode 100644 index 00000000..46d92a78 --- /dev/null +++ b/vnt-web/ui/src/utils/ipv4.test.js @@ -0,0 +1,12 @@ +import assert from "node:assert/strict"; +import test from "node:test"; +import { isValidIpv4 } from "./ipv4.js"; + +test("IPv4 DNS validation agrees with the backend address format", () => { + for (const value of ["0.0.0.0", "255.255.255.255", " 10.26.0.3 "]) { + assert.equal(isValidIpv4(value), true, value); + } + for (const value of ["010.26.0.3", "10.026.0.3", "256.0.0.1", "10.26.0", "::1", "invalid", ""]) { + assert.equal(isValidIpv4(value), false, value); + } +}); diff --git a/vnt-web/ui/src/utils/toml.js b/vnt-web/ui/src/utils/toml.js index bcb66b29..d62cf00b 100644 --- a/vnt-web/ui/src/utils/toml.js +++ b/vnt-web/ui/src/utils/toml.js @@ -10,6 +10,8 @@ export const emptyFormData = () => ({ punch_model: [], ip: "", mtu: null, + dns: [], + dns_explicit: false, rtx: false, fec: false, compress: false, @@ -85,6 +87,13 @@ export const parseTomlToForm = (toml) => { } else if (trimmed.includes("ip =")) { const match = trimmed.match(/ip\s*=\s*"([^"]*)"/); if (match) data.ip = match[1]; + } else if (trimmed.match(/^dns\s*=/)) { + const match = trimmed.match(/dns\s*=\s*\[(.*)\]/); + if (match) { + data.dns_explicit = true; + const items = match[1].match(/"([^"]*)"/g); + if (items) data.dns = items.map((s) => s.replace(/"/g, "")); + } } else if (trimmed.includes("mtu =")) { const match = trimmed.match(/mtu\s*=\s*(\d+)/); if (match) data.mtu = parseInt(match[1]); @@ -350,6 +359,13 @@ export const formToToml = (formData) => { toml += `mtu = ${formData.mtu}\n`; } + // 显式清空列表时保留 dns=[],避免丢失清空意图。 + const dnsServers = (formData.dns || []).map((s) => (s || "").trim()).filter(Boolean); + if (dnsServers.length > 0 || formData.dns_explicit) { + toml += `\n# 网卡 DNS(严格 IPv4,主备顺序);空列表使用系统 DNS\n`; + toml += `dns = [${dnsServers.map((s) => `"${s}"`).join(", ")}]\n`; + } + toml += "\n# --- 设备配置 ---\n"; if (formData.device_name) { toml += "\n# 设备名称 (可选,默认读取本机 hostname)\n"; @@ -489,6 +505,10 @@ device_mode = "tun" # MTU 设置 # mtu = 1400 +# 网卡 DNS:非空列表写入虚拟网卡接口,空列表或省略则使用系统 DNS。 +# 第 1 条主用,其余备用;建议填 VNT 对端(路由器)隧道 IP。 +# dns = ["10.26.0.3", "223.5.5.5"] + # --- 设备配置 --- # 设备名称 (可选,默认读取本机 hostname) diff --git a/vnt-web/ui/src/utils/toml.test.js b/vnt-web/ui/src/utils/toml.test.js new file mode 100644 index 00000000..9947886d --- /dev/null +++ b/vnt-web/ui/src/utils/toml.test.js @@ -0,0 +1,27 @@ +import assert from "node:assert/strict"; +import test from "node:test"; +import { emptyFormData, formToToml, parseTomlToForm } from "./toml.js"; + +test("DNS addresses work without a separate switch", () => { + const form = emptyFormData(); + form.dns = ["10.26.0.3", "223.5.5.5"]; + const toml = formToToml(form); + assert.match(toml, /dns = \["10.26.0.3", "223.5.5.5"\]/); + assert.doesNotMatch(toml, /dns_tunnel/); + assert.deepEqual(parseTomlToForm(toml).dns, form.dns); +}); + +test("clearing DNS preserves an explicit empty list", () => { + const form = parseTomlToForm('dns = ["10.26.0.3"]'); + form.dns = [" "]; + const toml = formToToml(form); + assert.match(toml, /dns = \[\]/); + const parsed = parseTomlToForm(toml); + assert.deepEqual(parsed.dns, []); + assert.equal(parsed.dns_explicit, true); +}); + +test("default DNS is omitted and explicit empty DNS survives editing", () => { + assert.doesNotMatch(formToToml(emptyFormData()), /^dns\s*=/m); + assert.match(formToToml(parseTomlToForm("dns = []")), /^dns = \[\]/m); +}); diff --git a/vnt-web/ui/src/views/ConfigEditor.vue b/vnt-web/ui/src/views/ConfigEditor.vue index e2f6a26d..2ec5bb43 100644 --- a/vnt-web/ui/src/views/ConfigEditor.vue +++ b/vnt-web/ui/src/views/ConfigEditor.vue @@ -7,6 +7,7 @@ import { useUiStore } from "../stores/ui"; import { getConfig, previewSubscription, saveConfig } from "../api"; import { emptyFormData, parseTomlToForm, formToToml, NEW_CONFIG_TEMPLATE } from "../utils/toml"; import { configHelp } from "../utils/configHelp"; +import { isValidIpv4 } from "../utils/ipv4"; const props = defineProps({ show: { type: Boolean, default: false }, @@ -60,6 +61,9 @@ const toggleSection = (key) => { // 打开编辑器时重置折叠状态;已有数据的分区自动展开,避免配置被藏起来 const resetSections = (data) => { sectionExpanded.value = { ...DEFAULT_SECTIONS }; + // 隧道 DNS:至少保留一行可编辑地址(列表为空时补一行空地址) + if (!Array.isArray(data.dns)) data.dns = []; + if (data.dns.length === 0) data.dns = [""]; if ( data.input.length || data.output.length || @@ -219,6 +223,14 @@ const handleSave = async () => { ui.toast.error("配置多个服务器时必须填写虚拟 IP"); return; } + // 与后端一致:保存的非空 DNS 地址都必须是严格 IPv4。 + const invalid = (formData.value.dns || []) + .map((s) => (s || "").trim()) + .filter((s) => s && !isValidIpv4(s)); + if (invalid.length > 0) { + ui.toast.error("DNS 地址无效(需为 IPv4):" + invalid.join(", ")); + return; + } configContent = formToToml(formData.value); } @@ -240,6 +252,29 @@ const removeBtnClass = "shrink-0 rounded-lg bg-red-50 px-3 py-2 text-red-500 transition-colors hover:bg-red-100 dark:bg-red-900/20 dark:text-red-500 dark:hover:bg-red-900/40"; const addBtnClass = "flex w-full items-center justify-center gap-1 rounded-lg bg-slate-100 px-3 py-2 text-sm text-slate-600 transition-colors hover:bg-slate-200 dark:bg-slate-700/50 dark:text-slate-300 dark:hover:bg-slate-700"; + +// DNS 输入框引用,用于新增行后自动聚焦 +const dnsInputRefs = ref([]); +const setDnsInputRef = (el, index) => { + if (el) dnsInputRefs.value[index] = el; +}; +const addDns = () => { + if (!Array.isArray(formData.value.dns)) formData.value.dns = []; + formData.value.dns_explicit = true; + formData.value.dns.push(""); + nextTick(() => { + const el = dnsInputRefs.value[formData.value.dns.length - 1]; + if (el && el.focus) el.focus(); + }); +}; +const removeDns = (index) => { + formData.value.dns_explicit = true; + if (formData.value.dns.length <= 1) { + formData.value.dns = [""]; + } else { + formData.value.dns.splice(index, 1); + } +}; const sectionTitleClass = "text-md flex items-center font-bold text-slate-900 dark:text-white"; const sectionChevronClass = (expanded) => `h-5 w-5 shrink-0 text-slate-400 transition-transform duration-200 ${expanded ? "rotate-180" : ""}`; @@ -586,6 +621,58 @@ const sectionChevronClass = (expanded) => + + +
+
+ + + + 网卡 DNS +
+ +

填写后应用到虚拟网卡;清空全部地址则使用系统 DNS。

+ +
+
+ + 第一行主用,其余备用 +
+
+
+ {{ index === 0 ? '主' : '备' }} + + +
+
+ +

+ + + + 建议填 VNT 对端(路由器)的隧道 IP,例如 10.26.0.3;多条按顺序主备兜底。需为合法 IPv4 地址。 +

+
+
diff --git a/vnt-web/ui/src/views/DashboardView.vue b/vnt-web/ui/src/views/DashboardView.vue index 3f41e674..85de5763 100644 --- a/vnt-web/ui/src/views/DashboardView.vue +++ b/vnt-web/ui/src/views/DashboardView.vue @@ -30,6 +30,14 @@ const tunnelListenAddresses = computed(() => { return [...new Set(addrs.map((item) => item.address))]; }); +// 按顺序列出网卡 DNS;空列表显示系统 DNS。 +const dnsSummary = computed(() => { + const info = app.selectedInfo; + const values = (info?.dns || []).map((s) => String(s).trim()).filter(Boolean); + if (values.length === 0) return "系统 DNS"; + return values.map((v, i) => v + (i === 0 ? "(主)" : "(备)")).join("\n"); +}); +