Skip to content

Add detail fields to invalid message errors #4821

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

Open
divergentdave wants to merge 1 commit into
base: release/0.7
Choose a base branch
from
+61 −50
Open

Add detail fields to invalid message errors #4821

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
99 changes: 52 additions & 47 deletions aggregator/src/aggregator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,58 +391,63 @@ impl<C: Clock> Aggregator<C> {
task_id_base64: Option<&[u8]>,
) -> Result<(Vec<u8>, Option<Signature>), Error> {
// Retrieve the appropriate HPKE config list.
let hpke_config_list =
if self.cfg.taskprov_config.enabled || self.cfg.require_global_hpke_keys {
// If we're running in taskprov mode or requiring global keys, unconditionally
// provide the global keys and ignore the task_id parameter.
let configs = self.global_hpke_keypairs.configs();
if configs.is_empty() {
return Err(Error::Internal(
"this server is missing its global HPKE config".into(),
));
} else {
HpkeConfigList::new(configs.to_vec())
}
let hpke_config_list = if self.cfg.taskprov_config.enabled
|| self.cfg.require_global_hpke_keys
{
// If we're running in taskprov mode or requiring global keys, unconditionally
// provide the global keys and ignore the task_id parameter.
let configs = self.global_hpke_keypairs.configs();
if configs.is_empty() {
return Err(Error::Internal(
"this server is missing its global HPKE config".into(),
));
} else {
// Otherwise, try to get the task-specific key.
match task_id_base64 {
Some(task_id_base64) => {
let task_id_bytes = URL_SAFE_NO_PAD
.decode(task_id_base64)
.map_err(|_| Error::InvalidMessage(None, "task_id"))?;
let task_id = TaskId::get_decoded(&task_id_bytes)
.map_err(|_| Error::InvalidMessage(None, "task_id"))?;
let task_aggregator = self
.task_aggregators
.get(&task_id)
.await?
.ok_or(Error::UnrecognizedTask(task_id))?;

match task_aggregator.handle_hpke_config() {
Some(hpke_config_list) => hpke_config_list,
// Assuming something hasn't gone horribly wrong with the database, this
// should only happen in the case where the system has been moved from taskprov
// mode to non-taskprov mode. Thus there's still taskprov tasks in the database.
// This isn't a supported use case, so the operator needs to delete these tasks
// or move the system back into taskprov mode.
None => {
return Err(Error::Internal("task has no HPKE configs".to_string()))
}
HpkeConfigList::new(configs.to_vec())
}
} else {
// Otherwise, try to get the task-specific key.
match task_id_base64 {
Some(task_id_base64) => {
let task_id_bytes = URL_SAFE_NO_PAD.decode(task_id_base64).map_err(|_| {
Error::InvalidMessage(None, "task_id parameter is not valid base64url")
})?;
let task_id = TaskId::get_decoded(&task_id_bytes).map_err(|_| {
Error::InvalidMessage(
None,
"task_id parameter is not of the correct length",
)
})?;
let task_aggregator = self
.task_aggregators
.get(&task_id)
.await?
.ok_or(Error::UnrecognizedTask(task_id))?;

match task_aggregator.handle_hpke_config() {
Some(hpke_config_list) => hpke_config_list,
// Assuming something hasn't gone horribly wrong with the database, this
// should only happen in the case where the system has been moved from taskprov
// mode to non-taskprov mode. Thus there's still taskprov tasks in the database.
// This isn't a supported use case, so the operator needs to delete these tasks
// or move the system back into taskprov mode.
None => {
return Err(Error::Internal("task has no HPKE configs".to_string()))
}
}
// No task ID present, try to fall back to a global config.
None => {
let configs = self.global_hpke_keypairs.configs();
if configs.is_empty() {
// This server isn't configured to provide global HPKE keys, the client
// should have given us a task ID.
return Err(Error::MissingTaskId);
} else {
HpkeConfigList::new(configs.to_vec())
}
}
// No task ID present, try to fall back to a global config.
None => {
let configs = self.global_hpke_keypairs.configs();
if configs.is_empty() {
// This server isn't configured to provide global HPKE keys, the client
// should have given us a task ID.
return Err(Error::MissingTaskId);
} else {
HpkeConfigList::new(configs.to_vec())
}
}
};
}
};

// Encode & (if configured to do so) sign the HPKE config list.
let encoded_hpke_config_list = hpke_config_list
Expand Down
12 changes: 9 additions & 3 deletions aggregator/src/aggregator/http_handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ async fn run_error_handler(error: &Error, mut conn: Conn) -> Conn {
let conn = match error {
Error::InvalidConfiguration(_) => conn.with_status(Status::InternalServerError),
Error::MessageDecode(_) => {
conn.with_problem_document(&ProblemDocument::new_dap(DapProblemType::InvalidMessage))
conn.with_problem_document(
&ProblemDocument::new_dap(DapProblemType::InvalidMessage)
.with_detail("Could not decode a message"),
)
}
Error::MessageEncode(_) => conn.with_status(Status::InternalServerError),
Error::ReportRejected(rejection) => match rejection.reason() {
Expand All @@ -69,8 +72,9 @@ async fn run_error_handler(error: &Error, mut conn: Conn) -> Conn {
.with_detail(rejection.reason().detail()),
),
},
Error::InvalidMessage(task_id, _) => {
Error::InvalidMessage(task_id, detail) => {
let mut doc = ProblemDocument::new_dap(DapProblemType::InvalidMessage);
doc = doc.with_detail(detail);
if let Some(task_id) = task_id {
doc = doc.with_task_id(task_id);
}
Expand Down Expand Up @@ -148,7 +152,9 @@ async fn run_error_handler(error: &Error, mut conn: Conn) -> Conn {
| Error::TaskParameters(_) => conn.with_status(Status::InternalServerError),
Error::AggregateShareRequestRejected(_, _) => conn.with_status(Status::BadRequest),
Error::EmptyAggregation(task_id) => conn.with_problem_document(
&ProblemDocument::new_dap(DapProblemType::InvalidMessage).with_task_id(task_id),
&ProblemDocument::new_dap(DapProblemType::InvalidMessage)
.with_task_id(task_id)
.with_detail("An empty aggregation with no report shares was attempted"),
),
Error::ForbiddenMutation { .. } => conn.with_status(Status::Conflict),
Error::BadRequest(_) => conn.with_status(Status::BadRequest),
Expand Down
Loading