fix Windows Direct service reachability
This commit is contained in:
+18
-9
@@ -6,8 +6,8 @@
|
||||
//!
|
||||
//! 三条设计约束:
|
||||
//! 1. **只在确实缺规则时申请**。每次启动都弹 UAC 是骚扰。
|
||||
//! 2. **被拒绝就记住**。写一个标记文件,之后只在界面上留一个手动按钮,
|
||||
//! 不再自动弹窗。
|
||||
//! 2. **没有放行就不宣称 Direct 已就绪**。用户明确点击“启动直传/接收”时,
|
||||
//! 可以走一次标准 UAC;拒绝或复检失败就停止启动,不生成不可用二维码。
|
||||
//! 3. **规则尽量窄**。只放行本程序这一个可执行文件,绝不整体关闭防火墙。
|
||||
//! 但**不能按网络配置文件收窄**——见下方 `grant()` 里的说明。
|
||||
//!
|
||||
@@ -101,7 +101,6 @@ fn current_exe() -> Result<PathBuf> {
|
||||
/// 可执行文件的**阻止**规则,名字是程序名而不是我们的 `QFT Desktop`。
|
||||
/// 只按显示名查完全看不到它,却又是它压着我们的放行规则——
|
||||
/// 表现就是「点了放行、界面显示已放行,手机依然连不上」。
|
||||
#[cfg(target_os = "windows")]
|
||||
fn probe_script(exe: &str) -> String {
|
||||
format!(
|
||||
r#"
|
||||
@@ -110,9 +109,9 @@ $exe = '{exe}'
|
||||
Get-NetFirewallProfile | ForEach-Object {{
|
||||
"PROFILE|$($_.Name)|$($_.Enabled)|$($_.DefaultInboundAction)|$($_.AllowInboundRules)"
|
||||
}}
|
||||
$byName = Get-NetFirewallRule -DisplayName '{RULE_NAME}'
|
||||
$byPath = Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule
|
||||
@($byName) + @($byPath) | Where-Object {{ $_ }} | Sort-Object -Property Name -Unique | ForEach-Object {{
|
||||
# 只查询当前 exe 路径。同名旧规则可能属于上一次构建目录;把它算成有效
|
||||
# 会让界面显示绿色,但当前 qft-desktop.exe 的入站仍被全部拦截。
|
||||
Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule | Sort-Object -Property Name -Unique | ForEach-Object {{
|
||||
"RULE|$($_.Enabled)|$($_.Direction)|$($_.Action)|$($_.Profile)|$($_.DisplayName)"
|
||||
}}
|
||||
"#,
|
||||
@@ -213,7 +212,7 @@ fn grant_script(exe: &str, marker: &str) -> String {
|
||||
# 重建放行规则。Profile Any 是刻意的:Windows 把没见过的网络\r\n\
|
||||
# (尤其是 Direct AP 虚拟网卡)默认归为公用网络。\r\n\
|
||||
Remove-NetFirewallRule -DisplayName '{RULE_NAME}' -ErrorAction SilentlyContinue\r\n\
|
||||
New-NetFirewallRule -DisplayName '{RULE_NAME}' -Direction Inbound -Program $exe -Action Allow -Profile Any -Enabled True | Out-Null\r\n\
|
||||
New-NetFirewallRule -DisplayName '{RULE_NAME}' -Direction Inbound -Program $exe -Action Allow -Profile Any -Enabled True -EdgeTraversalPolicy Allow | Out-Null\r\n\
|
||||
# 只有真的建成了才写标记,调用方据此判断成败\r\n\
|
||||
Set-Content -Path $marker -Value 'ok' -Encoding ASCII\r\n"
|
||||
)
|
||||
@@ -417,7 +416,7 @@ pub fn manual_instructions(port: u16) -> String {
|
||||
$exe = \"{exe}\"\n\
|
||||
Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule | Where-Object {{ $_.Direction -eq 'Inbound' -and $_.Action -eq 'Block' }} | Remove-NetFirewallRule\n\
|
||||
Remove-NetFirewallRule -DisplayName \"{RULE_NAME}\" -ErrorAction SilentlyContinue\n\
|
||||
New-NetFirewallRule -DisplayName \"{RULE_NAME}\" -Direction Inbound -Program $exe -Action Allow -Profile Any -Enabled True\n\
|
||||
New-NetFirewallRule -DisplayName \"{RULE_NAME}\" -Direction Inbound -Program $exe -Action Allow -Profile Any -Enabled True -EdgeTraversalPolicy Allow\n\
|
||||
Get-NetFirewallProfile | Select-Object Name,Enabled,AllowInboundRules\n\
|
||||
Get-NetFirewallApplicationFilter -Program $exe | Get-NetFirewallRule | Select-Object DisplayName,Enabled,Direction,Action,Profile\n"
|
||||
)
|
||||
@@ -657,15 +656,25 @@ mod tests {
|
||||
// 必须写成功标记,否则调用方无法区分「跑通了」和「脚本报错了」
|
||||
assert!(script.contains("Set-Content -Path $marker"));
|
||||
assert!(script.contains("-Profile Any"));
|
||||
assert!(script.contains("-EdgeTraversalPolicy Allow"));
|
||||
// 单引号要按 PowerShell 的规则翻倍转义
|
||||
let tricky = grant_script("C:\\o'brien\\qft.exe", "C:\\t.ok");
|
||||
assert!(tricky.contains("'C:\\o''brien\\qft.exe'"), "{tricky}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn probe_never_counts_a_same_named_rule_for_an_old_executable() {
|
||||
let script = probe_script(r"C:\new-build\qft-desktop.exe");
|
||||
assert!(script.contains("Get-NetFirewallApplicationFilter -Program $exe"));
|
||||
assert!(
|
||||
!script.contains("Get-NetFirewallRule -DisplayName"),
|
||||
"只按同名规则查询会把旧构建路径误判为已放行:{script}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn status_is_read_only_and_repeatable() {
|
||||
// 检测必须无副作用:连续调用结果一致,且不改动任何系统设置
|
||||
assert_eq!(status(), status());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+87
-24
@@ -1068,25 +1068,26 @@ impl QftApp {
|
||||
}
|
||||
|
||||
fn start_receiver(&mut self, ctx: &egui::Context) {
|
||||
// Direct AP 会新建一块虚拟网卡,其网络类型往往与主网卡不同,
|
||||
// 因此每次启动接收都重新检测一次,而不是沿用上次结果。
|
||||
self.refresh_firewall();
|
||||
let Some(save_dir) = self.receive.save_dir.clone() else { return };
|
||||
self.stop_receiver();
|
||||
if self.receive.use_direct_ap {
|
||||
self.receive.status = "正在核验当前 qft-desktop.exe 的防火墙规则…".into();
|
||||
if let Err(message) = self.ensure_direct_firewall_ready() {
|
||||
self.receive.status = message;
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
self.refresh_firewall();
|
||||
}
|
||||
self.receive.status = "正在初始化接收服务…".into();
|
||||
let token = pairing::new_session_token();
|
||||
let (tx, rx) = mpsc::channel();
|
||||
let server = match ReceiverServer::start(save_dir, token.clone(), tx) {
|
||||
Ok(v) => v,
|
||||
Err(e) => { self.receive.status = format!("接收服务启动失败:{e:#}"); return; }
|
||||
};
|
||||
|
||||
let mut direct_ap = None;
|
||||
let wifi = if self.receive.use_direct_ap {
|
||||
let (ssid, passphrase) = match pairing::load_or_create_direct_ap_credentials(&self.local_device) {
|
||||
Ok(v) => v,
|
||||
Err(e) => {
|
||||
drop(server);
|
||||
self.receive.status = format!("读取 QFT Direct 配网身份失败:{e:#}");
|
||||
return;
|
||||
}
|
||||
@@ -1097,15 +1098,24 @@ impl QftApp {
|
||||
Some(WifiCredentials { ssid, passphrase, security: "WPA2".into() })
|
||||
}
|
||||
Err(e) => {
|
||||
drop(server);
|
||||
self.receive.status = format!("QFT Direct 启动失败:{e:#}\n可切换到“当前局域网”备用模式。 ");
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else { None };
|
||||
|
||||
// Give the virtual adapter a moment to appear before enumerating addresses.
|
||||
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(250)); }
|
||||
// 先创建专用网络,再绑定 0.0.0.0。虽然 Windows 理论上会把既有的
|
||||
// INADDR_ANY socket 应用于后出现的网卡,但实机上 WFP/新网络配置文件
|
||||
// 初始化存在竞态;服务后绑定可消除这一不必要的不确定性。
|
||||
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(500)); }
|
||||
let server = match ReceiverServer::start(save_dir, token.clone(), tx) {
|
||||
Ok(v) => v,
|
||||
Err(e) => {
|
||||
drop(direct_ap);
|
||||
self.receive.status = format!("接收服务启动失败:{e:#}");
|
||||
return;
|
||||
}
|
||||
};
|
||||
let payload = PairingPayload {
|
||||
v: 2,
|
||||
session: token.clone(),
|
||||
@@ -1153,26 +1163,28 @@ impl QftApp {
|
||||
}
|
||||
|
||||
fn start_sender(&mut self, ctx: &egui::Context) {
|
||||
// Direct AP 的虚拟网卡类型与主网卡往往不同,每次启动都重新检测
|
||||
self.refresh_firewall();
|
||||
let Some(file) = self.send.file.clone() else { return };
|
||||
let Some(sha256) = self.send.sha256.clone() else { return };
|
||||
let file_name = file.file_name().and_then(|v| v.to_str()).unwrap_or("qft-download.bin").to_owned();
|
||||
self.stop_sender();
|
||||
if self.send.use_direct_ap {
|
||||
self.send.status = "正在核验当前 qft-desktop.exe 的防火墙规则…".into();
|
||||
if let Err(message) = self.ensure_direct_firewall_ready() {
|
||||
self.send.status = message;
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
self.refresh_firewall();
|
||||
}
|
||||
self.send.status = "正在初始化电脑发送服务…".into();
|
||||
let token = pairing::new_session_token();
|
||||
let (tx, rx) = mpsc::channel();
|
||||
let server = match SenderServer::start(file, token.clone(), tx) {
|
||||
Ok(v) => v,
|
||||
Err(e) => { self.send.status = format!("发送服务启动失败:{e:#}"); return; }
|
||||
};
|
||||
|
||||
let mut direct_ap = None;
|
||||
let wifi = if self.send.use_direct_ap {
|
||||
let (ssid, passphrase) = match pairing::load_or_create_direct_ap_credentials(&self.local_device) {
|
||||
Ok(v) => v,
|
||||
Err(e) => {
|
||||
drop(server);
|
||||
self.send.status = format!("读取 QFT Direct 配网身份失败:{e:#}");
|
||||
return;
|
||||
}
|
||||
@@ -1183,14 +1195,21 @@ impl QftApp {
|
||||
Some(WifiCredentials { ssid, passphrase, security: "WPA2".into() })
|
||||
}
|
||||
Err(e) => {
|
||||
drop(server);
|
||||
self.send.status = format!("QFT Direct 启动失败:{e:#}\n可切换到“当前局域网”备用模式。");
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else { None };
|
||||
|
||||
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(250)); }
|
||||
if direct_ap.is_some() { std::thread::sleep(Duration::from_millis(500)); }
|
||||
let server = match SenderServer::start(file, token.clone(), tx) {
|
||||
Ok(v) => v,
|
||||
Err(e) => {
|
||||
drop(direct_ap);
|
||||
self.send.status = format!("发送服务启动失败:{e:#}");
|
||||
return;
|
||||
}
|
||||
};
|
||||
let payload = PairingPayload {
|
||||
v: 2,
|
||||
session: token.clone(),
|
||||
@@ -1247,6 +1266,10 @@ impl QftApp {
|
||||
}
|
||||
for event in pending {
|
||||
match event {
|
||||
SenderEvent::TransportConnected { peer } => {
|
||||
self.send.connected_device = format!("Android({peer},正在认证)");
|
||||
self.send.status = "Android 已到达桌面 TCP 服务,正在校验二维码会话。".into();
|
||||
}
|
||||
SenderEvent::ClientConnected { device } => {
|
||||
self.send.connected_device = device;
|
||||
self.send.status = "Android 已确认本次二维码会话,正在准备下载。".into();
|
||||
@@ -1587,9 +1610,8 @@ impl QftApp {
|
||||
|
||||
/// 只做**只读检测**,不申请任何权限。
|
||||
///
|
||||
/// 早先版本会在启动接收时自动弹 UAC。实际用下来这太侵入:
|
||||
/// 多数人只是想收个文件,却先被要求管理员授权。
|
||||
/// 现在提权一律由用户点按钮触发(`request_firewall_grant`)。
|
||||
/// 普通页面刷新只读;用户明确启动 QFT Direct 时由
|
||||
/// `ensure_direct_firewall_ready` 负责必要的授权与复检。
|
||||
fn refresh_firewall(&mut self) {
|
||||
if self.pc.firewall_probing {
|
||||
return;
|
||||
@@ -1602,7 +1624,44 @@ impl QftApp {
|
||||
});
|
||||
}
|
||||
|
||||
/// 用户显式点击后才提权。
|
||||
/// Direct 模式不再允许在“防火墙大概没问题”的状态下生成二维码。
|
||||
///
|
||||
/// Windows 的应用规则绑定 exe 的完整路径;旧构建目录留下的同名规则
|
||||
/// 对当前二进制没有任何作用。这里同步核验当前路径,缺规则时走标准 UAC
|
||||
/// 创建后再复检。只有复检明确为 Allowed 才继续创建 AP 与监听服务。
|
||||
fn ensure_direct_firewall_ready(&mut self) -> Result<(), String> {
|
||||
self.pc.firewall_probe = None;
|
||||
self.pc.firewall_probing = false;
|
||||
let mut status = firewall::status();
|
||||
if matches!(status, firewall::FirewallStatus::Allowed) {
|
||||
self.pc.firewall = status;
|
||||
self.pc.firewall_note = "当前程序路径已确认放行".into();
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if status.fixable_by_grant() {
|
||||
self.pc.firewall = status;
|
||||
self.pc.firewall_note = "需要管理员确认后才能启动 QFT Direct".into();
|
||||
firewall::grant().map_err(|e| format!(
|
||||
"QFT Direct 未启动:当前 qft-desktop.exe 尚未真正放行。\n{e:#}\n请点击“放行防火墙”后重试。"
|
||||
))?;
|
||||
status = firewall::status();
|
||||
}
|
||||
|
||||
self.pc.firewall = status.clone();
|
||||
if matches!(status, firewall::FirewallStatus::Allowed) {
|
||||
self.pc.firewall_note = "当前程序路径已确认放行".into();
|
||||
Ok(())
|
||||
} else {
|
||||
self.pc.firewall_note = status.detail();
|
||||
Err(format!(
|
||||
"QFT Direct 未启动:无法确认当前 qft-desktop.exe 可接收入站连接。\n{}\n请先处理防火墙提示再重试。",
|
||||
status.detail()
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
/// 用户点击防火墙面板按钮时的手动授权入口。
|
||||
fn request_firewall_grant(&mut self) {
|
||||
match firewall::grant() {
|
||||
Ok(()) => {
|
||||
@@ -1784,6 +1843,10 @@ impl QftApp {
|
||||
}
|
||||
for event in pending {
|
||||
match event {
|
||||
ReceiverEvent::TransportConnected { peer } => {
|
||||
self.receive.connected_device = format!("Android({peer},正在认证)");
|
||||
self.receive.status = "Android 已到达桌面 TCP 服务,正在校验二维码会话。".into();
|
||||
}
|
||||
ReceiverEvent::ClientConnected { device } => {
|
||||
self.receive.connected_device = device;
|
||||
self.receive.status = "Android 已连接到电脑。可以开始发送文件。".into();
|
||||
|
||||
@@ -94,6 +94,24 @@ pub fn new_session_token() -> String {
|
||||
URL_SAFE_NO_PAD.encode(bytes)
|
||||
}
|
||||
|
||||
/// Decode an authenticated Direct discovery datagram. `Some(None)` preserves
|
||||
/// compatibility with older Android builds that did not include a device name.
|
||||
pub fn discovery_device(text: &str, session: &str) -> Option<Option<String>> {
|
||||
let prefix = format!("QFTDISC2:{session}");
|
||||
if text == prefix {
|
||||
return Some(None);
|
||||
}
|
||||
let encoded = text.strip_prefix(&(prefix + ":"))?;
|
||||
let bytes = URL_SAFE_NO_PAD.decode(encoded).ok()?;
|
||||
let name = String::from_utf8(bytes).ok()?;
|
||||
let clean: String = name
|
||||
.chars()
|
||||
.filter(|c| !c.is_control())
|
||||
.take(80)
|
||||
.collect();
|
||||
(!clean.trim().is_empty()).then_some(Some(clean))
|
||||
}
|
||||
|
||||
/// Keep one random AP identity per Windows device so Android can remember the
|
||||
/// user's approval for that exact local-only network. The AP itself is only
|
||||
/// active while QFT receive mode is running; the file-transfer session token is
|
||||
@@ -237,6 +255,18 @@ pub fn local_ipv4_endpoints(port: u16) -> Vec<String> {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn discovery_request_reports_android_name_and_accepts_legacy_format() {
|
||||
let session = "abcdefghijklmnopqrstuvwxyz012345";
|
||||
let name = URL_SAFE_NO_PAD.encode("HUAWEI CDY-AN90".as_bytes());
|
||||
assert_eq!(
|
||||
discovery_device(&format!("QFTDISC2:{session}:{name}"), session),
|
||||
Some(Some("HUAWEI CDY-AN90".into()))
|
||||
);
|
||||
assert_eq!(discovery_device(&format!("QFTDISC2:{session}"), session), Some(None));
|
||||
assert_eq!(discovery_device("QFTDISC2:wrong", session), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn download_pairing_uses_dedicated_short_prefix() {
|
||||
let payload = PairingPayload {
|
||||
|
||||
+11
-5
@@ -27,6 +27,7 @@ const IO_BUFFER: usize = 1024 * 1024;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum ReceiverEvent {
|
||||
TransportConnected { peer: String },
|
||||
ClientConnected { device: String },
|
||||
UploadStarted { device: String, file_name: String, size: u64 },
|
||||
UploadProgress { device: String, file_name: String, received: u64, size: u64 },
|
||||
@@ -96,7 +97,8 @@ impl ReceiverServer {
|
||||
let tcp_thread = thread::spawn(move || {
|
||||
while !stop_tcp.load(Ordering::Relaxed) {
|
||||
match listener.accept() {
|
||||
Ok((mut stream, _)) => {
|
||||
Ok((mut stream, peer)) => {
|
||||
let _ = events_tcp.send(ReceiverEvent::TransportConnected { peer: peer.to_string() });
|
||||
let dir = dir_tcp.clone();
|
||||
let token = token_tcp.clone();
|
||||
let tx = events_tcp.clone();
|
||||
@@ -139,7 +141,6 @@ impl ReceiverServer {
|
||||
}
|
||||
};
|
||||
let _ = socket.set_read_timeout(Some(Duration::from_millis(250)));
|
||||
let expected = format!("QFTDISC2:{token_udp}");
|
||||
let response = format!("QFTHERE2:{token_udp}:{port}");
|
||||
// PC↔PC 的对端不知道令牌,需要先能把本机列出来
|
||||
let announce = crate::discovery::browse_reply(&crate::discovery::NodeAnnounce {
|
||||
@@ -153,12 +154,17 @@ impl ReceiverServer {
|
||||
match socket.recv_from(&mut buf) {
|
||||
Ok((n, peer)) => {
|
||||
match std::str::from_utf8(&buf[..n]).ok() {
|
||||
Some(text) if text == expected => {
|
||||
let _ = socket.send_to(response.as_bytes(), peer);
|
||||
}
|
||||
Some(text) if text == crate::discovery::BROWSE_QUERY => {
|
||||
let _ = socket.send_to(&announce, peer);
|
||||
}
|
||||
Some(text) => {
|
||||
if let Some(device) = crate::pairing::discovery_device(text, &token_udp) {
|
||||
if let Some(device) = device {
|
||||
let _ = events.send(ReceiverEvent::ClientConnected { device });
|
||||
}
|
||||
let _ = socket.send_to(response.as_bytes(), peer);
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
+11
-4
@@ -22,6 +22,7 @@ const IO_BUFFER: usize = 1024 * 1024;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum SenderEvent {
|
||||
TransportConnected { peer: String },
|
||||
ClientConnected { device: String },
|
||||
DownloadStarted { device: String, file_name: String, size: u64 },
|
||||
DownloadCompleted { device: String, file_name: String },
|
||||
@@ -61,7 +62,8 @@ impl SenderServer {
|
||||
let tcp_thread = thread::spawn(move || {
|
||||
while !tcp_stop.load(Ordering::Relaxed) {
|
||||
match listener.accept() {
|
||||
Ok((mut stream, _)) => {
|
||||
Ok((mut stream, peer)) => {
|
||||
let _ = tcp_events.send(SenderEvent::TransportConnected { peer: peer.to_string() });
|
||||
let token = tcp_token.clone();
|
||||
let path = file_path.clone();
|
||||
let name = file_name.clone();
|
||||
@@ -93,15 +95,20 @@ impl SenderServer {
|
||||
}
|
||||
};
|
||||
let _ = socket.set_read_timeout(Some(Duration::from_millis(250)));
|
||||
let expected = format!("QFTDISC2:{session_token}");
|
||||
let response = format!("QFTHERE2:{session_token}:{port}");
|
||||
let mut buf = [0u8; 512];
|
||||
while !udp_stop.load(Ordering::Relaxed) {
|
||||
match socket.recv_from(&mut buf) {
|
||||
Ok((n, peer)) if std::str::from_utf8(&buf[..n]).ok() == Some(expected.as_str()) => {
|
||||
Ok((n, peer)) => {
|
||||
let Some(device) = std::str::from_utf8(&buf[..n])
|
||||
.ok()
|
||||
.and_then(|text| crate::pairing::discovery_device(text, &session_token))
|
||||
else { continue };
|
||||
if let Some(device) = device {
|
||||
let _ = events.send(SenderEvent::ClientConnected { device });
|
||||
}
|
||||
let _ = socket.send_to(response.as_bytes(), peer);
|
||||
}
|
||||
Ok(_) => {}
|
||||
Err(e) if matches!(e.kind(), std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut) => {}
|
||||
Err(_) => break,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user