Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions px-server/src/application/routing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,16 @@ impl SolveDispatcher for RoutingDispatcher {
outcome.status
)));
}
let user_agent = outcome.user_agent.clone().unwrap_or_default();
let bundle = PxCookieBundle::new(
outcome.cookies.set.clone(),
"px-harvester",
user_agent.clone(),
SystemTime::now(),
Duration::from_secs(600),
);
Ok(SolveOutput {
bundle,
user_agent: outcome.user_agent.unwrap_or_default(),
user_agent,
solve_ms: outcome.metrics.solve_ms,
cache_hit: false,
handler: outcome.handler,
Expand Down Expand Up @@ -163,6 +164,17 @@ mod tests {
assert_eq!(out.handler, "cloudflare");
}

/// Regression: the cookie bundle's `user_agent` must carry the real
/// harvester UA (so cache-hit replies preserve it), not a literal
/// placeholder string.
#[tokio::test]
async fn bundle_user_agent_matches_harvester() {
let d = RoutingDispatcher::new(Arc::new(StaticHandler { name: "perimeterx" }));
let out = d.solve("https://example.com/").await.expect("solve");
assert_eq!(out.user_agent, "ua");
assert_eq!(out.bundle.user_agent, "ua");
}

#[test]
fn parse_csv_trims_and_lowercases() {
let r = parse_camoufox_domains(Some(" Pedidosya.com.AR , ,foo.com "));
Expand Down
5 changes: 3 additions & 2 deletions px-server/src/application/solve_endpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@ impl SolveDispatcher for PxSolveDispatcher {
self.handler_name, outcome.status
)));
}
let user_agent = outcome.user_agent.clone().unwrap_or_default();
let bundle = PxCookieBundle::new(
outcome.cookies.set.clone(),
"px-harvester",
user_agent.clone(),
SystemTime::now(),
Duration::from_secs(600),
);
Ok(SolveOutput {
bundle,
user_agent: outcome.user_agent.unwrap_or_default(),
user_agent,
solve_ms: outcome.metrics.solve_ms,
cache_hit: false,
handler: outcome.handler,
Expand Down
Loading