Reparse all extensions, not just unrecognized ones #3344
Merged
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
…am's linked in registry of extensions when handling custom options in end-user schemas
|
The latest Buf updates on your PR. Results from workflow Buf CI / buf (pull_request).
|
bufdev
reviewed
Sep 26, 2024
| @@ -22,6 +22,8 @@ import ( | |||
| // ReparseUnrecognized uses the given resolver to parse any unrecognized fields in the | |||
| // given reflectMessage. It does so recursively, resolving any unrecognized fields in | |||
| // nested messages. | |||
| // | |||
| // Deprecated: Use ReparseExtensions instead. | |||
There was a problem hiding this comment.
Is there a specific reason we need to keep this around? If it's still used in core, refactor core to not use it
There was a problem hiding this comment.
I think description answers this - yes, force other repos to refactor
jhump
commented
Sep 26, 2024
bufdev
approved these changes
Sep 26, 2024
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.
When handling user-provided schemas (images, file descriptor sets, etc), we already reparse unrecognized fields, since custom options will usually be unrecognized, but we need all fields recognized in order to serialize deterministically.
However, we really need to re-parse all extensions (and thus all custom options), because if any are recognized, it means we're using the program's linked-in global registry of extensions, which could have a different definition from the extension as it is defined in the schema we are handling.
So this adds a new
ReparseExtensionsand deprecatedReparseUnrecognized. The new function will reparsed unrecognized fields (since they are usually unrecognized extensions), but it will also reparse recognized extensions -- by serializing them to bytes and then de-serializing using the proper resolver.I left the old one around, but deprecated, since it is used outside of this repo. But if we're okay with forcing the other repos to update all call sites in the same PR that updates the dependency, I can remove it.