@@ -90,13 +90,11 @@ fn classify_request_inner(
9090}
9191
9292fn 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
322345async 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}
0 commit comments