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

Add a request size limit #29

Merged
merged 8 commits into from
Aug 20, 2024
Merged
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/sdk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ serde = { version = "1.0.197", features = ["derive"] }
serde_json = { version = "1.0.115", features = ["raw_value"] }
thiserror = "1.0"
tokio = { version = "1.36.0", features = ["fs", "macros", "rt-multi-thread", "signal"] }
tower-http = { version = "0.4.4", features = ["cors", "trace", "validate-request"] }
tower-http = { version = "0.4.4", features = ["cors", "limit", "trace", "validate-request"] }
tracing = "0.1.40"
tracing-opentelemetry = "0.23.0"
tracing-subscriber = { version = "0.3", default-features = false, features = ["ansi", "env-filter", "fmt", "json"] }
2 changes: 1 addition & 1 deletion crates/sdk/src/connector/example.rs
Original file line number Diff line number Diff line change
@@ -126,7 +126,7 @@ mod tests {
async fn capabilities_match_ndc_spec_version() -> Result<()> {
let state =
crate::default_main::init_server_state(Example::default(), PathBuf::new()).await?;
let app = crate::default_main::create_router::<Example>(state, None);
let app = crate::default_main::create_router::<Example>(state, None, None);

let client = TestClient::new(app);
let response = client.get("/capabilities").send().await;
14 changes: 13 additions & 1 deletion crates/sdk/src/default_main.rs
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@ use axum::{
use axum_extra::extract::WithRejection;
use clap::{Parser, Subcommand};
use prometheus::Registry;
use tower_http::{trace::TraceLayer, validate_request::ValidateRequestHeaderLayer};
use tower_http::{
limit::RequestBodyLimitLayer, trace::TraceLayer, validate_request::ValidateRequestHeaderLayer,
};

use ndc_models::{
CapabilitiesResponse, ExplainResponse, MutationRequest, MutationResponse, QueryRequest,
@@ -74,6 +76,8 @@ struct ServeCommand {
service_token_secret: Option<String>,
#[arg(long, value_name = "NAME", env = "OTEL_SERVICE_NAME")]
service_name: Option<String>,
#[arg(long, value_name = "MAX_REQUEST_SIZE", env = "HASURA_MAX_REQUEST_SIZE")]
max_request_size: Option<usize>,
}

#[derive(Clone, Parser)]
@@ -242,6 +246,7 @@ where
let router = create_router::<Setup::Connector>(
server_state.clone(),
serve_command.service_token_secret.clone(),
serve_command.max_request_size,
);

let address = net::SocketAddr::new(serve_command.host, serve_command.port);
@@ -296,6 +301,7 @@ pub async fn init_server_state<Setup: ConnectorSetup>(
pub fn create_router<C>(
state: ServerState<C>,
service_token_secret: Option<String>,
max_request_size: Option<usize>,
) -> axum::Router<()>
where
C: Connector + 'static,
@@ -310,6 +316,12 @@ where
.route("/query/explain", post(post_query_explain::<C>))
.route("/mutation", post(post_mutation::<C>))
.route("/mutation/explain", post(post_mutation_explain::<C>))
// We want to limit the size of requests to 100MB to prevent various DDoS / SQL overflow
// vulnerabilities. We use RequestBodyLimit instead of DefaultBodyLimit to include chunked
// requests, too.
.layer(RequestBodyLimitLayer::new(
max_request_size.unwrap_or(100 * 1024 * 1024),
))
.layer(ValidateRequestHeaderLayer::custom(auth_handler(
service_token_secret,
)))