X Tutup
Skip to content

Fixed graphql.execution.UnknownOperationExceptionso that it does not escape #3826

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

Merged
bbakerman merged 2 commits into from
Feb 17, 2025
Merged

Fixed graphql.execution.UnknownOperationExceptionso that it does not escape #3826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcfe719
Fixed bad operation exception so that it does not escape
bbakerman Feb 17, 2025
d7d29b2
Fixed bad operation exception so that it does not escape - extra test…
bbakerman Feb 17, 2025
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
23 changes: 12 additions & 11 deletions src/main/java/graphql/execution/Execution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
import graphql.incremental.DelayedIncrementalPartialResult;
import graphql.incremental.IncrementalExecutionResultImpl;
import graphql.language.Document;
import graphql.language.FragmentDefinition;
import graphql.language.NodeUtil;
import graphql.language.OperationDefinition;
import graphql.language.VariableDefinition;
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLSchema;
import graphql.schema.impl.SchemaUtil;
import org.jetbrains.annotations.NotNull;
import org.reactivestreams.Publisher;

import java.util.Collections;
Expand Down Expand Up @@ -69,16 +69,11 @@ public Execution(ExecutionStrategy queryStrategy,

public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSchema graphQLSchema, ExecutionId executionId, ExecutionInput executionInput, InstrumentationState instrumentationState) {

NodeUtil.GetOperationResult getOperationResult = NodeUtil.getOperation(document, executionInput.getOperationName());
Map<String, FragmentDefinition> fragmentsByName = getOperationResult.fragmentsByName;
OperationDefinition operationDefinition = getOperationResult.operationDefinition;

RawVariables inputVariables = executionInput.getRawVariables();
List<VariableDefinition> variableDefinitions = operationDefinition.getVariableDefinitions();

NodeUtil.GetOperationResult getOperationResult;
CoercedVariables coercedVariables;
try {
coercedVariables = ValuesResolver.coerceVariableValues(graphQLSchema, variableDefinitions, inputVariables, executionInput.getGraphQLContext(), executionInput.getLocale());
getOperationResult = NodeUtil.getOperation(document, executionInput.getOperationName());
coercedVariables = coerceVariableValues(graphQLSchema, executionInput, getOperationResult.operationDefinition);
} catch (RuntimeException rte) {
if (rte instanceof GraphQLError) {
return completedFuture(new ExecutionResultImpl((GraphQLError) rte));
Expand All @@ -98,10 +93,10 @@ public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSche
.graphQLContext(executionInput.getGraphQLContext())
.localContext(executionInput.getLocalContext())
.root(executionInput.getRoot())
.fragmentsByName(fragmentsByName)
.fragmentsByName(getOperationResult.fragmentsByName)
.coercedVariables(coercedVariables)
.document(document)
.operationDefinition(operationDefinition)
.operationDefinition(getOperationResult.operationDefinition)
.dataLoaderRegistry(executionInput.getDataLoaderRegistry())
.locale(executionInput.getLocale())
.valueUnboxer(valueUnboxer)
Expand All @@ -117,6 +112,12 @@ public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSche
return executeOperation(executionContext, executionInput.getRoot(), executionContext.getOperationDefinition());
}

private static @NotNull CoercedVariables coerceVariableValues(GraphQLSchema graphQLSchema, ExecutionInput executionInput, OperationDefinition operationDefinition) {
RawVariables inputVariables = executionInput.getRawVariables();
List<VariableDefinition> variableDefinitions = operationDefinition.getVariableDefinitions();
return ValuesResolver.coerceVariableValues(graphQLSchema, variableDefinitions, inputVariables, executionInput.getGraphQLContext(), executionInput.getLocale());
}


private CompletableFuture<ExecutionResult> executeOperation(ExecutionContext executionContext, Object root, OperationDefinition operationDefinition) {

Expand Down
44 changes: 40 additions & 4 deletions src/test/groovy/graphql/GraphQLTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import graphql.execution.ExecutionContext
import graphql.execution.ExecutionId
import graphql.execution.ExecutionIdProvider
import graphql.execution.ExecutionStrategyParameters
import graphql.execution.MissingRootTypeException
import graphql.execution.ResultNodesInfo
import graphql.execution.SubscriptionExecutionStrategy
import graphql.execution.ValueUnboxer
Expand Down Expand Up @@ -328,7 +327,7 @@ class GraphQLTest extends Specification {
result.errors.size() == 0
}

def "document with two operations but no specified operation throws"() {
def "document with two operations but no specified operation does not throw"() {
Copy link
Member Author

@bbakerman bbakerman Feb 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change in behavior - no longer throwing an exception

given:

GraphQLSchema schema = newSchema().query(
Expand All @@ -344,10 +343,12 @@ class GraphQLTest extends Specification {
"""

when:
GraphQL.newGraphQL(schema).build().execute(query)
def er = GraphQL.newGraphQL(schema).build().execute(query)

then:
thrown(GraphQLException)
noExceptionThrown()
!er.errors.isEmpty()
er.errors[0].message.contains("Must provide operation name if query contains multiple operations")
}

def "null mutation type does not throw an npe but returns and error"() {
Expand Down Expand Up @@ -1569,4 +1570,39 @@ many lines''']
er.data == [hello: [[name: "w1"], [name: "w2"], [name: "w3"]]]
}

def "exceptions thrown are turned into graphql errors"() {
def sdl = """
type Query {
f(arg : Boolean) : String
}
"""

def graphQL = TestUtil.graphQL(sdl).build()

when:
def ei = newExecutionInput("query badSyntax {").build()
def er = graphQL.execute(ei)
then:
!er.errors.isEmpty()
er.errors[0].message.contains("Invalid syntax with offending token")


when:

ei = newExecutionInput('query badInput($varX : Boolean) { f(arg : $varX) }')
.variables([varX: "bad"]).build()
er = graphQL.execute(ei)
then:
!er.errors.isEmpty()
er.errors[0].message.contains("Variable 'varX' has an invalid value")

when:

ei = newExecutionInput("query ok1 { f } query ok2 { f } ")
.operationName("X").build()
er = graphQL.execute(ei)
then:
!er.errors.isEmpty()
er.errors[0].message.contains("Unknown operation named 'X'")
}
}
Loading
X Tutup