escape attacker-controlled strings in the json encoder#28678
Open
arshsmith1 wants to merge 1 commit into
Open
Conversation
This file contains hidden or 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
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.
jsonenc_fieldpathonly rejects uppercase letters and malformed underscores, then writes every other byte straight into the output withjsonenc_putbytes, inside the quotes thatjsonenc_fieldmaskputs around it. FieldMask paths are ordinary wire data, so a peer who sends the patha","injected":"bgets{"maskVal":"a","injected":"b"}out ofupb_JsonEncodeand can add top-level keys of their choosing.jsonenc_fieldvalhas the same shape for field names:json_nameis the one name the def builder never runs through_upb_DefBuilder_CheckIdent, so a descriptor carryingjson_name = "a\":1,\"b"also breaks out of the string.The fix follows what
WriteFieldMaskinsrc/google/protobuf/json/internal/unparser.ccalready does, which is an allowlist of[a-z0-9._]and an error on anything else, so the two implementations agree on which masks are encodable. Field names go throughjsonenc_stringfor the same reason C++ routes them throughWriteEscapedUtf8. Both belong in the encoder rather than in the callers, since the callers here are just handing over message data they parsed. Tests added for each; they fail on main and pass with this change, and the upb suite including conformance stays green.