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.

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

fix(router): handle empty body parse failures in bad request logger middleware #3544

Merged
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
2 changes: 1 addition & 1 deletion crates/router/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ pub fn get_application_builder(
.wrap(middleware::default_response_headers())
.wrap(middleware::RequestId)
.wrap(cors::cors())
.wrap(middleware::LogSpanInitializer)
// this middleware works only for Http1.1 requests
.wrap(middleware::Http400RequestDetailsLogger)
.wrap(middleware::LogSpanInitializer)
.wrap(router_env::tracing_actix_web::TracingLogger::default())
}
23 changes: 17 additions & 6 deletions crates/router/src/middleware.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,24 @@ where
let response = response_fut.await?;
// Log the request_details when we receive 400 status from the application
if response.status() == 400 {
let value: serde_json::Value = serde_json::from_slice(&bytes)?;
let request_id = request_id_fut.await?.as_hyphenated().to_string();
logger::info!(
"request_id: {}, request_details: {}",
request_id,
get_request_details_from_value(&value, "")
);
if !bytes.is_empty() {
let value_result: Result<serde_json::Value, serde_json::Error> =
serde_json::from_slice(&bytes);
match value_result {
Ok(value) => {
logger::info!(
"request_id: {request_id}, request_details: {}",
get_request_details_from_value(&value, "")
);
}
Err(err) => {
logger::warn!("error while parsing the request in json value: {err}");
}
}
} else {
logger::info!("request_id: {request_id}, request_details: Empty Body");
}
}
Ok(response)
})
Expand Down
Loading