Max query depth called later in beginExecuteOperation #2773
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…wn in MaxQueryDepthInstrumentation
…w are called at execution time not after validation
bbakerman
commented
Mar 26, 2022
| @Override | ||
| public InstrumentationState createState(InstrumentationCreateStateParameters parameters) { | ||
| return new State(); | ||
| } |
There was a problem hiding this comment.
Only needed so we can capture InstrumentationValidationParameters parameters to maintain API
bbakerman
commented
Mar 26, 2022
| instrumentationContext.onCompleted(null, new RuntimeException()) | ||
| then: | ||
| 0 * queryTraversal._(_) | ||
|
|
There was a problem hiding this comment.
These no longer make sense since we dont go via validation anymore
bbakerman
commented
Mar 26, 2022
| 0 * queryTraversal._(_) | ||
|
|
||
| } | ||
|
|
There was a problem hiding this comment.
Again does not make sense any more as wel dont do work on validation
|
This fixes #2811 |
andimarek
reviewed
Apr 29, 2022
| } | ||
| State state = parameters.getInstrumentationState(); | ||
| // for API backwards compatibility reasons we capture the validation parameters, so we can put them into QueryComplexityInfo | ||
| state.instrumentationValidationParameters = parameters; |
There was a problem hiding this comment.
this could be read in another Thread I think. Therefore instrumentationValidationParameters would need to synchronized or Atomic I think
There was a problem hiding this comment.
fixed - in reality it would not be a problem since the 2 methods are called within the same thread - but hey - I fixed it anyway
andimarek
approved these changes
Apr 29, 2022
andimarek
approved these changes
Apr 29, 2022
berngp
added a commit
to Netflix/dgs-framework
that referenced
this pull request
May 4, 2022
> This bug fix release contains an important fix > [#2773](graphql-java/graphql-java#2773) > The latest 18.0 version of graphql-java changed the way raw values are resolved to canonical values. > However this revealed a bug in MaxQueryXXX instrumentation where invalid values (null being present for non nullable input values) > caused an exception rather than generating a graphql error. This is not a behavior we intended. > The bug is only present if you use graphql.analysis.MaxQueryDepthInstrumentation and graphql.analysis.MaxQueryDepthInstrumentation https://github.com/graphql-java/graphql-java/releases/tag/v18.1
5 tasks
berngp
added a commit
to Netflix/dgs-framework
that referenced
this pull request
May 4, 2022
> This bug fix release contains an important fix > [#2773](graphql-java/graphql-java#2773) > The latest 18.0 version of graphql-java changed the way raw values are resolved to canonical values. > However this revealed a bug in MaxQueryXXX instrumentation where invalid values (null being present for non nullable input values) > caused an exception rather than generating a graphql error. This is not a behavior we intended. > The bug is only present if you use graphql.analysis.MaxQueryDepthInstrumentation and graphql.analysis.MaxQueryDepthInstrumentation https://github.com/graphql-java/graphql-java/releases/tag/v18.1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously the MaxQuery depth instrumentation was called on the end of the validation step. But this is too early if there are null / non null variables mismatched. This caused and exception to be thrown and not a graphql error.
We now call the instrumentation during the
beginExecuteOperationwhich is JUST before execution proper and not after validation - because theExecutioncode does some more sensibility checks on the state of the callI started this branch from #2763 which showed the problem happening
I am leaving that PR so we can improve the error messages - but this PR fixes the actual problem in the sense query checks are done a smidge later and avoid the problem all together