Skip to content
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

Jump to bottom

Test that auth token format must match #1400

Merged
merged 1 commit into from
May 23, 2023
Merged

Test that auth token format must match #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
117 changes: 50 additions & 67 deletions aggregator/src/aggregator/http_handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ impl Handler for StatusCounter {

pub(crate) static AGGREGATION_JOB_ROUTE: &str =
"tasks/:task_id/aggregation_jobs/:aggregation_job_id";
pub(crate) static COLLECTION_JOB_ROUTE: &str = "tasks/:task_id/collection_jobs/:collection_job_id";
pub(crate) static AGGREGATE_SHARES_ROUTE: &str = "tasks/:task_id/aggregate_shares";

/// Constructs a Trillium handler for the aggregator.
Expand Down Expand Up @@ -235,15 +236,15 @@ pub fn aggregator_handler<C: Clock>(
instrumented(api(aggregation_jobs_post::<C>)),
)
.put(
"tasks/:task_id/collection_jobs/:collection_job_id",
COLLECTION_JOB_ROUTE,
instrumented(api(collection_jobs_put::<C>)),
)
.post(
"tasks/:task_id/collection_jobs/:collection_job_id",
COLLECTION_JOB_ROUTE,
instrumented(api(collection_jobs_post::<C>)),
)
.delete(
"tasks/:task_id/collection_jobs/:collection_job_id",
COLLECTION_JOB_ROUTE,
instrumented(api(collection_jobs_delete::<C>)),
)
.post(
Expand Down Expand Up @@ -1200,8 +1201,6 @@ mod tests {

datastore.put_task(&task).await.unwrap();

let (wrong_auth_header, wrong_auth_value) =
random::<AuthenticationToken>().request_authentication();
let request = AggregationJobInitializeReq::new(
Vec::new(),
PartialBatchSelector::new_time_interval(),
Expand All @@ -1212,72 +1211,56 @@ mod tests {
aggregator_handler(Arc::new(datastore), clock, default_aggregator_config()).unwrap();
let aggregation_job_id: AggregationJobId = random();

let mut test_conn = put(task
.aggregation_job_uri(&aggregation_job_id)
.unwrap()
.path())
.with_request_header(wrong_auth_header, wrong_auth_value)
.with_request_header(
KnownHeaderName::ContentType,
AggregationJobInitializeReq::<TimeInterval>::MEDIA_TYPE,
)
.with_request_body(request.get_encoded())
.run_async(&handler)
.await;
let wrong_token_value = random();

let want_status = 400;
let problem_details: serde_json::Value = serde_json::from_slice(
&test_conn
.take_response_body()
// Send the right token, but the wrong format: we find a DapAuth token in the task's
// aggregator tokens and convert it to an equivalent Bearer token, which should be rejected.
let wrong_token_format = task
.aggregator_auth_tokens()
.iter()
.find(|token| matches!(token, AuthenticationToken::DapAuth(_)))
.map(|token| AuthenticationToken::Bearer(token.as_ref().to_vec()))
.unwrap();

for auth_token in [Some(wrong_token_value), Some(wrong_token_format), None] {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

let mut test_conn = put(task
.aggregation_job_uri(&aggregation_job_id)
.unwrap()
.into_bytes()
.await
.unwrap(),
)
.unwrap();
assert_eq!(
problem_details,
json!({
"status": want_status,
"type": "urn:ietf:params:ppm:dap:error:unauthorizedRequest",
"title": "The request's authorization is not valid.",
"taskid": format!("{}", task.id()),
})
);
assert_eq!(want_status, test_conn.status().unwrap() as u16);
.path())
.with_request_header(
KnownHeaderName::ContentType,
AggregationJobInitializeReq::<TimeInterval>::MEDIA_TYPE,
)
.with_request_body(request.get_encoded());

let mut test_conn = put(task
.aggregation_job_uri(&aggregation_job_id)
.unwrap()
.path())
.with_request_header(
KnownHeaderName::ContentType,
AggregationJobInitializeReq::<TimeInterval>::MEDIA_TYPE,
)
.with_request_body(request.get_encoded())
.run_async(&handler)
.await;
if let Some(auth_token) = auth_token {
let (auth_header, auth_value) = auth_token.request_authentication();
test_conn = test_conn.with_request_header(auth_header, auth_value);
}

let want_status = 400;
let problem_details: serde_json::Value = serde_json::from_slice(
&test_conn
.take_response_body()
.unwrap()
.into_bytes()
.await
.unwrap(),
)
.unwrap();
assert_eq!(
problem_details,
json!({
"status": want_status,
"type": "urn:ietf:params:ppm:dap:error:unauthorizedRequest",
"title": "The request's authorization is not valid.",
"taskid": format!("{}", task.id()),
})
);
assert_eq!(want_status, test_conn.status().unwrap() as u16);
let mut test_conn = test_conn.run_async(&handler).await;

let want_status = 400;
let problem_details: serde_json::Value = serde_json::from_slice(
&test_conn
.take_response_body()
.unwrap()
.into_bytes()
.await
.unwrap(),
)
.unwrap();
assert_eq!(
problem_details,
json!({
"status": want_status,
"type": "urn:ietf:params:ppm:dap:error:unauthorizedRequest",
"title": "The request's authorization is not valid.",
"taskid": format!("{}", task.id()),
})
);
assert_eq!(want_status, test_conn.status().unwrap() as u16);
}
}

#[tokio::test]
Expand Down
8 changes: 6 additions & 2 deletions core/src/task.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,9 +556,13 @@ pub enum AuthenticationToken {
),

/// Token presented as the value of the "DAP-Auth-Token" HTTP header. Conforms to
/// [draft-ietf-dap-ppm-01 section 3.2][1].
/// [draft-dcook-ppm-dap-interop-test-design-03][1], sections [4.3.3][2] and [4.4.2][3], and
/// [draft-ietf-dap-ppm-01 section 3.2][4].
///
/// [1]: https://datatracker.ietf.org/doc/html/draft-ietf-ppm-dap-01#name-https-sender-authentication
/// [1]: https://datatracker.ietf.org/doc/html/draft-dcook-ppm-dap-interop-test-design-03
/// [2]: https://datatracker.ietf.org/doc/html/draft-dcook-ppm-dap-interop-test-design-03#section-4.3.3
/// [3]: https://datatracker.ietf.org/doc/html/draft-dcook-ppm-dap-interop-test-design-03#section-4.4.2
/// [4]: https://datatracker.ietf.org/doc/html/draft-ietf-ppm-dap-01#name-https-sender-authentication
DapAuth(DapAuthToken),
}

Expand Down