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

Remove a duplicate span. #7

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Remove a duplicate span. #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8067fad
Remove the duplicate request span.
SamirTalwar Apr 23, 2024
06fb472
Factor the authentication handler into its own function.
SamirTalwar Apr 23, 2024
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
79 changes: 39 additions & 40 deletions crates/sdk/src/default_main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ where
C::Configuration: Clone,
C::State: Clone,
{
let router = Router::new()
Router::new()
.route("/capabilities", get(get_capabilities::<C>))
.route("/health", get(get_health::<C>))
.route("/metrics", get(get_metrics::<C>))
Expand All @@ -319,53 +319,52 @@ where
);
}),
)
.with_state(state);
.with_state(state)
.layer(ValidateRequestHeaderLayer::custom(auth_handler(
service_token_secret,
)))
}

fn auth_handler(
service_token_secret: Option<String>,
) -> impl Fn(&mut Request<Body>) -> Result<(), axum::response::Response> + Clone {
let expected_auth_header: Option<HeaderValue> =
service_token_secret.and_then(|service_token_secret| {
let expected_bearer = format!("Bearer {service_token_secret}");
HeaderValue::from_str(&expected_bearer).ok()
});

router
.layer(
TraceLayer::new_for_http()
.make_span_with(make_span)
.on_response(on_response),
move |request| {
// Validate the request
let auth_header = request.headers().get("Authorization").cloned();

// NOTE: The comparison should probably be more permissive to allow for whitespace, etc.
if auth_header == expected_auth_header {
return Ok(());
}

let message = "Bearer token does not match.".to_string();

tracing::error!(
meta.signal_type = "log",
event.domain = "ndc",
event.name = "Authorization error",
name = "Authorization error",
body = message,
error = true,
);
Err((
StatusCode::UNAUTHORIZED,
Json(ErrorResponse {
message: "Internal error".into(),
details: serde_json::Value::Object(serde_json::Map::from_iter([(
"cause".into(),
serde_json::Value::String(message),
)])),
}),
)
.layer(ValidateRequestHeaderLayer::custom(
move |request: &mut Request<Body>| {
// Validate the request
let auth_header = request.headers().get("Authorization").cloned();

// NOTE: The comparison should probably be more permissive to allow for whitespace, etc.
if auth_header == expected_auth_header {
return Ok(());
}

let message = "Bearer token does not match.".to_string();

tracing::error!(
meta.signal_type = "log",
event.domain = "ndc",
event.name = "Authorization error",
name = "Authorization error",
body = message,
error = true,
);
Err((
StatusCode::UNAUTHORIZED,
Json(ErrorResponse {
message: "Internal error".into(),
details: serde_json::Value::Object(serde_json::Map::from_iter([(
"cause".into(),
serde_json::Value::String(message),
)])),
}),
)
.into_response())
},
))
.into_response())
}
}

async fn get_metrics<C: Connector>(
Expand Down
Loading