dearsky/numa
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases 25 Wiki Activity

style: cargo fmt

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Razvan Dimescu
2026-04-11 03:04:50 +03:00
parent d725091642
commit 1bae696810
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/doh.rs
View File

@@ -14,10 +14,7 @@ use crate::packet::DnsPacket;
const MAX_DNS_MSG: usize = 4096; const MAX_DNS_MSG: usize = 4096;
const DOH_CONTENT_TYPE: &str = "application/dns-message"; const DOH_CONTENT_TYPE: &str = "application/dns-message";
pub async fn doh_post( pub async fn doh_post(State(state): State<super::proxy::DohState>, req: Request) -> Response {
State(state): State<super::proxy::DohState>,
req: Request,
) -> Response {
let host = super::proxy::extract_host(&req); let host = super::proxy::extract_host(&req);
if !is_doh_host(host.as_deref(), &state.ctx.proxy_tld) { if !is_doh_host(host.as_deref(), &state.ctx.proxy_tld) {
return StatusCode::NOT_FOUND.into_response(); return StatusCode::NOT_FOUND.into_response();
@@ -34,7 +31,9 @@ pub async fn doh_post(
let body = match axum::body::to_bytes(req.into_body(), MAX_DNS_MSG).await { let body = match axum::body::to_bytes(req.into_body(), MAX_DNS_MSG).await {
Ok(b) => b, Ok(b) => b,
Err(_) => return (StatusCode::PAYLOAD_TOO_LARGE, "body exceeds 4096 bytes").into_response(), Err(_) => {
return (StatusCode::PAYLOAD_TOO_LARGE, "body exceeds 4096 bytes").into_response()
}
}; };
if body.is_empty() { if body.is_empty() {
@@ -51,10 +50,12 @@ pub async fn doh_post(
fn is_doh_host(host: Option<&str>, tld: &str) -> bool { fn is_doh_host(host: Option<&str>, tld: &str) -> bool {
match host { match host {
Some(h) if h == tld => true, Some(h) if h == tld => true,
Some(h) => h.len() == 2 * tld.len() + 1 Some(h) => {
&& h.starts_with(tld) h.len() == 2 * tld.len() + 1
&& h.as_bytes().get(tld.len()) == Some(&b'.') && h.starts_with(tld)
&& h.ends_with(tld), && h.as_bytes().get(tld.len()) == Some(&b'.')
&& h.ends_with(tld)
}
None => false, None => false,
} }
} }
@@ -103,12 +104,7 @@ async fn resolve_doh(dns_bytes: &[u8], src: SocketAddr, ctx: &ServerCtx) -> Resp
fn extract_min_ttl(wire: &[u8]) -> u32 { fn extract_min_ttl(wire: &[u8]) -> u32 {
let mut buf = BytePacketBuffer::from_bytes(wire); let mut buf = BytePacketBuffer::from_bytes(wire);
match DnsPacket::from_buffer(&mut buf) { match DnsPacket::from_buffer(&mut buf) {
Ok(pkt) => pkt Ok(pkt) => pkt.answers.iter().map(|r| r.ttl()).min().unwrap_or(0),
.answers
.iter()
.map(|r| r.ttl())
.min()
.unwrap_or(0),
Err(_) => 0, Err(_) => 0,
} }
} }
@@ -118,7 +114,10 @@ fn dns_response(wire: &[u8], min_ttl: u32) -> Response {
StatusCode::OK, StatusCode::OK,
[ [
(hyper::header::CONTENT_TYPE, DOH_CONTENT_TYPE), (hyper::header::CONTENT_TYPE, DOH_CONTENT_TYPE),
(hyper::header::CACHE_CONTROL, &format!("max-age={}", min_ttl)), (
hyper::header::CACHE_CONTROL,
&format!("max-age={}", min_ttl),
),
], ],
Bytes::copy_from_slice(wire), Bytes::copy_from_slice(wire),
) )

5
src/proxy.rs
View File

@@ -112,7 +112,10 @@ pub async fn start_proxy_tls(ctx: Arc<ServerCtx>, port: u16, bind_addr: Ipv4Addr
conn_doh_state.remote_addr = Some(remote_addr); conn_doh_state.remote_addr = Some(remote_addr);
let app = Router::new() let app = Router::new()
.route("/dns-query", post(crate::doh::doh_post).with_state(conn_doh_state)) .route(
"/dns-query",
post(crate::doh::doh_post).with_state(conn_doh_state),
)
.fallback(any(proxy_handler)) .fallback(any(proxy_handler))
.with_state(proxy_state.clone()); .with_state(proxy_state.clone());