From 11d8f3a63c1b3e5f93231eee96996d848d0c7732 Mon Sep 17 00:00:00 2001 From: pmendes Date: Tue, 1 Oct 2024 17:15:13 +0100 Subject: [PATCH] Add missing parse collect job id test to router tests --- crates/daphne-server/src/router/mod.rs | 29 +++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/crates/daphne-server/src/router/mod.rs b/crates/daphne-server/src/router/mod.rs index 0a753be5..f64827a5 100644 --- a/crates/daphne-server/src/router/mod.rs +++ b/crates/daphne-server/src/router/mod.rs @@ -445,7 +445,7 @@ mod test { }; use daphne::{ async_test_versions, - messages::{AggregationJobId, Base64Encode, TaskId}, + messages::{AggregationJobId, Base64Encode, CollectionJobId, TaskId}, DapError, DapRequest, DapResource, DapSender, DapVersion, }; use daphne_service_utils::{ @@ -631,6 +631,33 @@ mod test { async_test_versions! { parse_agg_job_id } + async fn parse_collect_job_id(version: DapVersion) { + let test = test_router(); + + let task_id = mk_task_id(); + let collect_job_id = CollectionJobId(thread_rng().gen()); + + let req = test( + Request::builder() + .uri(format!( + "/{version}/{}/{}/parse-collect-job-id", + task_id.to_base64url(), + collect_job_id.to_base64url(), + )) + .header(CONTENT_TYPE, "application/dap-collect-req") + .header(http_headers::DAP_AUTH_TOKEN, BEARER_TOKEN) + .body(Body::empty()) + .unwrap(), + ) + .await + .unwrap(); + + assert_eq!(req.resource, DapResource::CollectionJob(collect_job_id)); + assert_eq!(req.task_id.unwrap(), task_id); + } + + async_test_versions! { parse_collect_job_id } + async fn incorrect_bearer_tokens_are_rejected(version: DapVersion) { let test = test_router();