Skip to content

fix(proxy): only route GET to dfdaemon, bypass other methods #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaius-qi merged 3 commits into from
Apr 13, 2026
Merged

fix(proxy): only route GET to dfdaemon, bypass other methods #1773

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba50a2
fix(proxy): only route GET to dfdaemon, bypass other methods
Looka149 Apr 9, 2026
93c956f
fix(proxy): update comments and log messages to reflect GET-only routing
Looka149 Apr 10, 2026
d560f79
fix(proxy): skip dfdaemon for non-GET requests with X-Dragonfly-Use-P2P
gaius-qi Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 82 additions & 42 deletions dragonfly-client/src/proxy/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,24 +381,34 @@ pub async fn http_handler(
}

// If find the matching rule, proxy the request via the dfdaemon.
// Only GET requests are routed to P2P; other methods (HEAD/PUT/POST/DELETE)
// fall through to direct proxy to avoid data loss.
let request_uri = request.uri();
if let Some(rule) = find_matching_rule(
config.proxy.rules.as_deref(),
url::Url::parse(&request_uri.to_string()).or_err(ErrorType::ParseError)?,
) {
info!(
"proxy HTTP request via dfdaemon by rule config: {:?}",
if request.method() == Method::GET {
info!(
"proxy HTTP request via dfdaemon by rule config: {:?}",
request
);

return proxy_via_dfdaemon(
config,
task,
&rule,
request,
remote_ip,
dfdaemon_download_client,
)
.await;
}

debug!(
"proxy HTTP request bypassing dfdaemon for non-GET method: {:?}",
request
);
return proxy_via_dfdaemon(
config,
task,
&rule,
request,
remote_ip,
dfdaemon_download_client,
)
.await;
}

// If the request header contains the X-Dragonfly-Use-P2P header, proxy the request via the
Expand All @@ -408,29 +418,39 @@ pub async fn http_handler(
"proxy HTTP request via dfdaemon by X-Dragonfly-Use-P2P header: {:?}",
request
);
return proxy_via_dfdaemon(
config,
task,
&Rule::default(),
request,
remote_ip,
dfdaemon_download_client,
)
.await;

if request.method() == Method::GET {
return proxy_via_dfdaemon(
config,
task,
&Rule::default(),
request,
remote_ip,
dfdaemon_download_client,
)
.await;
}

debug!(
"proxy HTTP request bypassing dfdaemon for non-GET method: {:?}",
request
);
}

if request.uri().scheme().cloned() == Some(http::uri::Scheme::HTTPS) {
info!(
"proxy HTTPS request directly to remote server: {:?}",
request
);

return proxy_via_https(request, registry_cert).await;
}

info!(
"proxy HTTP request directly to remote server: {:?}",
request
);

return proxy_via_http(request).await;
}

Expand Down Expand Up @@ -617,56 +637,76 @@ pub async fn upgraded_handler(
}

// If find the matching rule, proxy the request via the dfdaemon.
// Only GET requests are routed to P2P; other methods (HEAD/PUT/POST/DELETE)
// fall through to direct proxy to avoid data loss.
let request_uri = request.uri();
if let Some(rule) = find_matching_rule(
config.proxy.rules.as_deref(),
url::Url::parse(&request_uri.to_string()).or_err(ErrorType::ParseError)?,
) {
info!(
"proxy HTTPS request via dfdaemon by rule config: {:?}",
if request.method() == Method::GET {
info!(
"proxy HTTPS request via dfdaemon by rule config: {:?}",
request,
);

return proxy_via_dfdaemon(
config,
task,
&rule,
request,
remote_ip,
dfdaemon_download_client,
)
.await;
}

debug!(
"proxy HTTPS request bypassing dfdaemon for non-GET method: {:?}",
request,
);
return proxy_via_dfdaemon(
config,
task,
&rule,
request,
remote_ip,
dfdaemon_download_client,
)
.await;
}

// If the request header contains the X-Dragonfly-Use-P2P header, proxy the request via the
// dfdaemon.
if header::get_use_p2p(request.headers()) {
info!(
"proxy HTTP request via dfdaemon by X-Dragonfly-Use-P2P header: {:?}",
if request.method() == Method::GET {
info!(
"proxy HTTP request via dfdaemon by X-Dragonfly-Use-P2P header: {:?}",
request,
);

return proxy_via_dfdaemon(
config,
task,
&Rule::default(),
request,
remote_ip,
dfdaemon_download_client,
)
.await;
}

debug!(
"proxy HTTPS request bypassing dfdaemon for non-GET method: {:?}",
request,
);
return proxy_via_dfdaemon(
config,
task,
&Rule::default(),
request,
remote_ip,
dfdaemon_download_client,
)
.await;
}

if request.uri().scheme().cloned() == Some(http::uri::Scheme::HTTPS) {
info!(
"proxy HTTPS request directly to remote server: {:?}",
request,
);

return proxy_via_https(request, registry_cert).await;
}

info!(
"proxy HTTP request directly to remote server: {:?}",
request,
);

return proxy_via_http(request).await;
}

Expand Down
Loading