diff --git a/vnt/Cargo.toml b/vnt/Cargo.toml index ae8907b..fd98962 100644 --- a/vnt/Cargo.toml +++ b/vnt/Cargo.toml @@ -31,6 +31,7 @@ rsa = { version = "0.9.2", features = [], optional = true } spki = { version = "0.7.2", features = ["fingerprint", "alloc", "base64"], optional = true } openssl-sys = { git = "https://github.com/vnt-dev/rust-openssl", optional = true } libsm = { git = "https://github.com/vnt-dev/libsm", optional = true } +http_req = { git = "https://github.com/lmq8267/http_req.git", default-features = false, features = ["rust-tls"] } mio = { version = "=0.8.11", features = ["os-poll", "net", "os-ext"] } crossbeam-queue = "0.3.11" @@ -84,4 +85,4 @@ zstd_compress = ["zstd"] integrated_tun = ["tun-rs"] upnp = ["igd"] ws = ["tokio-tungstenite"] -wss = ["ws", "tokio-tungstenite/rustls-tls-native-roots", "tokio-tungstenite/rustls-tls-webpki-roots", "rustls"] \ No newline at end of file +wss = ["ws", "tokio-tungstenite/rustls-tls-native-roots", "tokio-tungstenite/rustls-tls-webpki-roots", "rustls"] diff --git a/vnt/src/channel/ws_channel.rs b/vnt/src/channel/ws_channel.rs index bb7409a..30af458 100644 --- a/vnt/src/channel/ws_channel.rs +++ b/vnt/src/channel/ws_channel.rs @@ -103,7 +103,16 @@ where if let Ok(redirect) = v.to_str() { log::info!("url重定向响应头 {:?}", res.headers()); log::info!("url重定向地址 {}", redirect); - url = redirect.to_string(); + // 替换协议前缀 + if redirect.starts_with("http://") { + url = redirect.replacen("http://", "ws://", 1); + } else if redirect.starts_with("https://") { + url = redirect.replacen("https://", "wss://", 1); + } else { + url = redirect.to_string(); + } + println!("Location:{}", url); + log::info!("最终地址: {}", url); continue; } } diff --git a/vnt/src/util/dns_query.rs b/vnt/src/util/dns_query.rs index 04314f3..58d3399 100644 --- a/vnt/src/util/dns_query.rs +++ b/vnt/src/util/dns_query.rs @@ -4,7 +4,8 @@ use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, ToSocketAddrs, UdpSocket}; use std::str::FromStr; use std::time::Duration; use std::{io, thread}; - +use http_req::request::{Request, RedirectPolicy}; +use http_req::uri::Uri; use crate::channel::socket::LocalInterface; use anyhow::Context; use dns_parser::{Builder, Packet, QueryClass, QueryType, RData, ResponseCode}; @@ -82,21 +83,48 @@ pub fn dns_query_all( mut name_servers: Vec, default_interface: &LocalInterface, ) -> anyhow::Result> { - match SocketAddr::from_str(domain) { + let mut current_domain = domain.to_string(); // 引入可变变量存储当前域名 + match SocketAddr::from_str(¤t_domain) { Ok(addr) => Ok(vec![addr]), Err(_) => { - let txt_domain = domain + // 重定向判断 http: + let current_domain_lower = current_domain.to_lowercase(); + let redirect_domain = current_domain_lower + .strip_prefix("http:") + .or_else(|| current_domain_lower.strip_prefix("https:")) + .map(|v| v.to_string()); + + // 执行重定向检查 + if let Some(stripped) = redirect_domain { + if let Some(redirected_url) = check_for_redirect(&stripped)? { + + // 去掉 URL 开头的协议部分 + let final_domain = remove_http_prefix(&redirected_url); + println!("Server Address: {}", final_domain); + + // 检查是否为 IP 和端口组合 + if let Ok(socket_addr) = SocketAddr::from_str(&final_domain) { + // 如果是 IP 和端口格式,直接返回结果 + return Ok(vec![socket_addr]); + } else { + // 如果不是 IP 和端口格式,则更新为重定向地址 + current_domain = final_domain; + } + } + } + let txt_domain = current_domain .to_lowercase() .strip_prefix("txt:") .map(|v| v.to_string()); if name_servers.is_empty() { if txt_domain.is_some() { name_servers.push("223.5.5.5:53".into()); + name_servers.push("119.29.29.29:53".into()); name_servers.push("114.114.114.114:53".into()); } else { - return Ok(domain + return Ok(current_domain .to_socket_addrs() - .with_context(|| format!("DNS query failed {:?}", domain))? + .with_context(|| format!("DNS query failed {:?}", current_domain))? .collect()); } } @@ -107,6 +135,7 @@ pub fn dns_query_all( match txt_dns(domain, name_server, default_interface) { Ok(addr) => { if !addr.is_empty() { + println!("TXT: {:?}", addr); return Ok(addr); } } @@ -120,12 +149,13 @@ pub fn dns_query_all( } continue; } - let end_index = domain + + let end_index = current_domain .rfind(':') - .with_context(|| format!("{:?} not port", domain))?; + .with_context(|| format!("{:?} not port", current_domain))?; let host = &domain[..end_index]; let port = u16::from_str(&domain[end_index + 1..]) - .with_context(|| format!("{:?} not port", domain))?; + .with_context(|| format!("{:?} not port", current_domain))?; let th1 = { let host = host.to_string(); let name_server = name_server.clone(); @@ -174,12 +204,96 @@ pub fn dns_query_all( if let Some(e) = err { Err(e) } else { - Err(anyhow::anyhow!("DNS query failed {:?}", domain)) + Err(anyhow::anyhow!("DNS query failed {:?}", current_domain)) } } } } +fn parse_host_port(addr: &str) -> bool { + // 处理 IPv6 地址(格式为 [::1]:8080) + if addr.starts_with('[') { + if let Some(idx) = addr.rfind(']') { + if let Some(port_idx) = addr[idx+1..].find(':') { + let port = &addr[idx+1+port_idx+1..]; // 提取端口部分 + return !port.is_empty() && port.chars().all(|c| c.is_numeric()); + } + } + } else { + // 处理 IPv4 和普通域名(格式为 example.com:443 或 192.168.1.1:8080) + if let Some((_host, port)) = addr.rsplit_once(':') { + return !port.is_empty() && port.chars().all(|c| c.is_numeric()); + } + } + false +} + +fn check_for_redirect(domain: &String) -> anyhow::Result> { + // 确保域名有 http:// 或 https:// 前缀 + let mut url = if domain.starts_with("http://") || domain.starts_with("https://") { + domain.clone() + } else { + format!("http://{}", domain) + }; + // 解析 URL + let uri = match Uri::try_from(url.as_str()) { + Ok(u) => u, + Err(e) => { + println!("解析地址失败: {}", e); + return Ok(None); + } + }; + + let mut response_body = Vec::new(); + + // 发送 HTTP 请求 + let response = match Request::new(&uri) + .timeout(Duration::from_secs(20)) + .redirect_policy(RedirectPolicy::Limit(0)) + .send(&mut response_body) + { + Ok(resp) => { + println!("HTTP Status Code: {}", resp.status_code()); + resp + } + Err(_) => { + return Ok(None); + } + }; + + let body_str = String::from_utf8_lossy(&response_body); + let cleaned_body = body_str.replace('\n', "").replace('\r', ""); + println!("Response Body: {}", cleaned_body); + // 处理 3XX 重定向 + if response.status_code().is_redirect() { + if let Some(location) = response.headers().get("Location") { + url = location.to_string().trim_end_matches('/').to_string(); + println!("Location: {}", url); + return Ok(Some(url)); + } + } + + // 处理 200 响应 + if response.status_code().is_success() { + for line in body_str.lines() { + let trimmed = line.trim(); + if parse_host_port(trimmed) { + println!("text: {}", trimmed); + return Ok(Some(trimmed.to_string())); + } + } + return Ok(None); + } + Ok(None) +} + +/// 去掉 http:// 或 https:// 前缀 +fn remove_http_prefix(url: &str) -> String { + url.trim_start_matches("http://") + .trim_start_matches("https://") + .to_string() +} + fn query<'a>( udp: &UdpSocket, domain: &str,