plan renderer: ensure JSON strings are completely JSON #34959
Merged
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.
Don't merge (or at least backport) this until after the release of 1.8.0 has been completed this week.
In #34702 we modified the JSON parsing of the plan renderer to support large (> 2^64) numbers. In doing so we changed the parsing to use the json.Decoder. The Decoder accepts partial JSON strings, so this means that a string that starts with a valid JSON object and then ends with a non-JSON piece of text is interpreted as valid JSON.
This PR updates the renderer so it checks the decoder has consumed the complete string before trusting that the returned object can be rendered as JSON.
In Martin's comments, he details how the
ctyjson
package supports this and the large number parsing by default. Unfortunately, we can't use thectyjson
package here as the renderer doesn't handlecty.Value
objects instead just relying on the raw JSON objects that are available from thejsonplan
package.Fixes #34954
Target Version
v1.8.1
Proposed CHANGELOG
BUG FIXES