Skip to content

fix(relay): allow NIP-98 authorization preflights #7

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

Closed
branarakic-agent wants to merge 1 commit into from
Closed

fix(relay): allow NIP-98 authorization preflights #7

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
45 changes: 42 additions & 3 deletions crates/buzz-relay/src/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use axum::{
};
use serde_json::json;
use tower::ServiceExt;
use tower_http::cors::{AllowOrigin, CorsLayer};
use tower_http::cors::{AllowHeaders, AllowOrigin, CorsLayer};
use tower_http::limit::RequestBodyLimitLayer;
use tower_http::services::ServeDir;
use tower_http::trace::{HttpMakeClassifier, TraceLayer};
Expand Down Expand Up @@ -443,7 +443,10 @@ async fn mesh_status_handler(State(state): State<Arc<AppState>>) -> impl IntoRes
/// Build a CORS layer from the configured origins list.
fn build_cors_layer(cors_origins: &[String]) -> CorsLayer {
if cors_origins.is_empty() {
return CorsLayer::permissive();
return CorsLayer::new()
.allow_origin(tower_http::cors::Any)
.allow_methods(tower_http::cors::Any)
.allow_headers(AllowHeaders::mirror_request());
}

let origins: Vec<axum::http::HeaderValue> = cors_origins
Expand All @@ -463,7 +466,10 @@ fn build_cors_layer(cors_origins: &[String]) -> CorsLayer {
CorsLayer::new()
.allow_origin(AllowOrigin::list(origins))
.allow_methods(tower_http::cors::Any)
.allow_headers(tower_http::cors::Any)
// `Authorization` is a CORS non-wildcard request header. WebKit rejects
// `Access-Control-Allow-Headers: *` for NIP-98 requests, so echo the
// browser's requested header list explicitly.
.allow_headers(AllowHeaders::mirror_request())
}

#[cfg(test)]
Expand Down Expand Up @@ -511,6 +517,39 @@ mod tests {
assert!(!should_serve_spa("/arbitrary", true));
}

#[tokio::test]
async fn cors_preflight_explicitly_allows_nip98_authorization() {
let app = Router::new()
.route("/api/dkg/query", axum::routing::post(|| async {}))
.layer(build_cors_layer(&[]));

let response = app
.oneshot(
Request::builder()
.method("OPTIONS")
.uri("/api/dkg/query")
.header(axum::http::header::ORIGIN, "tauri://localhost")
.header(axum::http::header::ACCESS_CONTROL_REQUEST_METHOD, "POST")
.header(
axum::http::header::ACCESS_CONTROL_REQUEST_HEADERS,
"authorization,content-type",
)
.body(Body::empty())
.unwrap(),
)
.await
.unwrap();

assert_eq!(response.status(), StatusCode::OK);
assert_eq!(
response
.headers()
.get(axum::http::header::ACCESS_CONTROL_ALLOW_HEADERS)
.unwrap(),
"authorization,content-type"
);
}

#[tokio::test(flavor = "current_thread")]
async fn http_and_datastore_spans_are_exported_in_the_same_trace() {
let exporter = InMemorySpanExporter::default();
Expand Down
Loading