Port DOS protections to our protojson fork #143
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
This commit ports over the fixes (and tests) for the two DOS bugs fixed by golang/protobuf recently: 1. golang/protobuf#1583 2. golang/protobuf#1584 These changes come from protocolbuffers/protobuf-go@bfcd647
cretz
approved these changes
Jan 3, 2024
rodrigozhou
reviewed
Jan 3, 2024
Comment on lines
+312
to
+324
| var open int | ||
| for { | ||
| tok, err := d.Read() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| case json.ArrayOpen: | ||
| for { | ||
| tok, err := d.Peek() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| switch tok.Kind() { | ||
| case json.ArrayClose: | ||
| d.Read() | ||
| return nil | ||
| default: | ||
| // Skip array item. | ||
| if err := d.skipJSONValue(); err != nil { | ||
| return err | ||
| } | ||
| switch tok.Kind() { | ||
| case json.ObjectClose, json.ArrayClose: | ||
| open-- | ||
| case json.ObjectOpen, json.ArrayOpen: | ||
| open++ | ||
| if open > d.opts.RecursionLimit { | ||
| return errors.New("exceeded max recursion depth") |
There was a problem hiding this comment.
You're not doing recursion anymore, so does it matter to track the depth?
There was a problem hiding this comment.
This is copied verbatim from the official codebase
We'd need to fork the whole protobuf stack to do so, which would suck. We could do that and periodically rebase our changes on the upstream, but that's a lot of work |
tdeebswihart
added a commit
to temporalio/sdk-go
that referenced
this pull request
Jan 3, 2024
See temporalio/api-go#143 for details
tdeebswihart
added a commit
to temporalio/sdk-go
that referenced
this pull request
Jan 8, 2024
See temporalio/api-go#143 for details
tdeebswihart
added a commit
to temporalio/sdk-go
that referenced
this pull request
Jan 8, 2024
Bump the version of go-api fix the protojson DOS vulns recently patched in the upstream golang/protobuf. See temporalio/api-go#143 for details
tdeebswihart
added a commit
to temporalio/temporal
that referenced
this pull request
Jan 8, 2024
## What was changed I bumped the version of api-go and sdk-go and _slightly_ altered our nettest RPC factory interface to deal with changes in v1.60.0 of go-grpc ## Why? To fix the protojson DOS vulns recently patched in the upstream golang/protobuf. See temporalio/api-go#143 for details ## How did you test it? I pulled the tests added to the protojson repo into our fork ## Potential risks N/A ## Is hotfix candidate? No as it requires all our other proto changes which aren't released
tdeebswihart
added a commit
to temporalio/temporal
that referenced
this pull request
Jan 9, 2024
## What was changed I bumped the version of api-go and sdk-go and _slightly_ altered our nettest RPC factory interface to deal with changes in v1.60.0 of go-grpc ## Why? To fix the protojson DOS vulns recently patched in the upstream golang/protobuf. See temporalio/api-go#143 for details ## How did you test it? I pulled the tests added to the protojson repo into our fork ## Potential risks N/A ## Is hotfix candidate? No as it requires all our other proto changes which aren't released
tdeebswihart
added a commit
to temporalio/temporal
that referenced
this pull request
Jan 9, 2024
## What was changed I bumped the version of api-go and sdk-go and _slightly_ altered our nettest RPC factory interface to deal with changes in v1.60.0 of go-grpc ## Why? To fix the protojson DOS vulns recently patched in the upstream golang/protobuf. See temporalio/api-go#143 for details ## How did you test it? I pulled the tests added to the protojson repo into our fork ## Potential risks N/A ## Is hotfix candidate? No as it requires all our other proto changes which aren't released
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.
What changed?
I ported over the DOS fixes from the official protobuf repository
Why?
Two DOS bugs were fixed by golang/protobuf recently:
How did you test it?
I ported over their tests for the issue
Potential risks
None,