Skip to content

Commit 2595827

Browse files
committed
fix(policy): harden graphql get inspection
1 parent 2a7c7d7 commit 2595827

3 files changed

Lines changed: 296 additions & 23 deletions

File tree

‎crates/openshell-sandbox/src/l7/graphql.rs‎

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,11 @@ fn classify_request_inner(
9090
}
9191

9292
fn classify_get(request: &L7Request) -> std::result::Result<Vec<GraphqlOperationInfo>, String> {
93-
let query = first_query_value(&request.query_params, "query");
94-
let operation_name = first_query_value(&request.query_params, "operationName");
95-
let extensions = first_query_value(&request.query_params, "extensions")
93+
let query = unique_query_value(&request.query_params, "query")?;
94+
let operation_name = unique_query_value(&request.query_params, "operationName")?;
95+
let extensions = unique_query_value(&request.query_params, "extensions")?
9696
.and_then(|raw| serde_json::from_str::<Value>(&raw).ok());
97-
let id = first_query_value(&request.query_params, "id")
98-
.or_else(|| first_query_value(&request.query_params, "documentId"))
99-
.or_else(|| first_query_value(&request.query_params, "queryId"));
97+
let id = unique_persisted_query_id(&request.query_params)?;
10098

10199
classify_envelope(
102100
query.as_deref(),
@@ -311,12 +309,37 @@ fn persisted_query_hash(extensions: Option<&Value>) -> Option<String> {
311309
.map(ToString::to_string)
312310
}
313311

314-
fn first_query_value(params: &HashMap<String, Vec<String>>, key: &str) -> Option<String> {
315-
params
316-
.get(key)
317-
.and_then(|values| values.first())
318-
.filter(|value| !value.is_empty())
319-
.cloned()
312+
fn unique_query_value(
313+
params: &HashMap<String, Vec<String>>,
314+
key: &str,
315+
) -> std::result::Result<Option<String>, String> {
316+
let Some(values) = params.get(key) else {
317+
return Ok(None);
318+
};
319+
if values.len() > 1 {
320+
return Err(format!(
321+
"GraphQL GET parameter {key:?} must not appear more than once"
322+
));
323+
}
324+
Ok(values.first().filter(|value| !value.is_empty()).cloned())
325+
}
326+
327+
fn unique_persisted_query_id(
328+
params: &HashMap<String, Vec<String>>,
329+
) -> std::result::Result<Option<String>, String> {
330+
let mut selected: Option<(String, String)> = None;
331+
for key in ["id", "documentId", "queryId"] {
332+
let Some(value) = unique_query_value(params, key)? else {
333+
continue;
334+
};
335+
if let Some((existing_key, _)) = selected {
336+
return Err(format!(
337+
"GraphQL GET persisted-query id parameters {existing_key:?} and {key:?} must not be combined"
338+
));
339+
}
340+
selected = Some((key.to_string(), value));
341+
}
342+
Ok(selected.map(|(_, value)| value))
320343
}
321344

322345
async fn read_body_for_inspection<C: AsyncRead + Unpin>(
@@ -567,4 +590,31 @@ mod tests {
567590
assert_eq!(op.operation_name.as_deref(), Some("Viewer"));
568591
assert_eq!(op.persisted_query_hash.as_deref(), Some("abc123"));
569592
}
593+
594+
#[test]
595+
fn graphql_get_rejects_duplicate_query_parameter() {
596+
let req = request(
597+
"GET",
598+
"/graphql?query=query+Viewer+%7B+viewer+%7B+login+%7D+%7D&query=mutation+Delete+%7B+volumeDelete(volumeId%3A%22x%22)+%7B+id+%7D+%7D",
599+
);
600+
let info = classify_request(&req, b"");
601+
assert!(
602+
info.error
603+
.as_deref()
604+
.is_some_and(|err| err.contains("must not appear more than once")),
605+
"expected duplicate control parameter error, got {info:?}"
606+
);
607+
}
608+
609+
#[test]
610+
fn graphql_get_rejects_ambiguous_persisted_query_ids() {
611+
let req = request("GET", "/graphql?id=one&queryId=two");
612+
let info = classify_request(&req, b"");
613+
assert!(
614+
info.error
615+
.as_deref()
616+
.is_some_and(|err| err.contains("must not be combined")),
617+
"expected ambiguous persisted-query id error, got {info:?}"
618+
);
619+
}
570620
}

‎crates/openshell-sandbox/src/proxy.rs‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2424,6 +2424,7 @@ async fn handle_forward_proxy(
24242424
let policy_str = matched_policy.as_deref().unwrap_or("-");
24252425
let sandbox_entrypoint_pid = entrypoint_pid.load(Ordering::Acquire);
24262426
let mut forward_request_bytes = buf[..used].to_vec();
2427+
let mut upstream_target = path.clone();
24272428

24282429
// 4b. If the endpoint has L7 config, evaluate the request against
24292430
// L7 policy. The forward proxy handles exactly one request per
@@ -2478,6 +2479,12 @@ async fn handle_forward_proxy(
24782479
let query_params =
24792480
match crate::l7::path::canonicalize_request_target(&path, &canonicalize_options) {
24802481
Ok((canon, query)) => {
2482+
upstream_target = match query.as_deref() {
2483+
Some(raw_query) if !raw_query.is_empty() => {
2484+
format!("{}?{raw_query}", canon.path)
2485+
}
2486+
_ => canon.path.clone(),
2487+
};
24812488
let params = query
24822489
.as_deref()
24832490
.map_or_else(std::collections::HashMap::new, |q| {
@@ -2902,7 +2909,7 @@ async fn handle_forward_proxy(
29022909
let rewritten = match rewrite_forward_request(
29032910
&forward_request_bytes,
29042911
forward_request_bytes.len(),
2905-
&path,
2912+
&upstream_target,
29062913
secret_resolver.as_deref(),
29072914
) {
29082915
Ok(bytes) => bytes,
@@ -3995,6 +4002,30 @@ mod tests {
39954002
);
39964003
}
39974004

4005+
#[test]
4006+
fn test_rewrite_forward_request_preserves_canonical_query_on_the_wire() {
4007+
let raw = b"GET http://host/public/../graphql?query=query+Viewer+%7B+viewer+%7B+login+%7D+%7D HTTP/1.1\r\nHost: host\r\n\r\n";
4008+
let (canon, raw_query) = crate::l7::path::canonicalize_request_target(
4009+
"/public/../graphql?query=query+Viewer+%7B+viewer+%7B+login+%7D+%7D",
4010+
&crate::l7::path::CanonicalizeOptions::default(),
4011+
)
4012+
.expect("canonicalization should preserve query separately");
4013+
let upstream_target = match raw_query.as_deref() {
4014+
Some(raw_query) if !raw_query.is_empty() => format!("{}?{raw_query}", canon.path),
4015+
_ => canon.path,
4016+
};
4017+
4018+
let rewritten = rewrite_forward_request(raw, raw.len(), &upstream_target, None)
4019+
.expect("rewrite_forward_request should succeed");
4020+
let rewritten_str = String::from_utf8_lossy(&rewritten);
4021+
assert!(
4022+
rewritten_str.starts_with(
4023+
"GET /graphql?query=query+Viewer+%7B+viewer+%7B+login+%7D+%7D HTTP/1.1\r\n"
4024+
),
4025+
"outbound request line must preserve canonical query, got: {rewritten_str:?}"
4026+
);
4027+
}
4028+
39984029
#[test]
39994030
fn test_rewrite_resolves_placeholder_auth_headers() {
40004031
let (_, resolver) = SecretResolver::from_provider_env(

0 commit comments

Comments
 (0)