Pull in protojson vuln fixes #5267
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
stephanos
reviewed
Jan 8, 2024
| @@ -41,20 +41,20 @@ require ( | |||
| go.opentelemetry.io/otel/metric v1.19.0 | |||
| go.opentelemetry.io/otel/sdk v1.19.0 | |||
| go.opentelemetry.io/otel/sdk/metric v1.19.0 | |||
| go.temporal.io/api v1.26.2-0.20231129165614-630d88440548 | |||
| go.temporal.io/sdk v1.25.2-0.20231129171107-288a04f72145 | |||
| go.temporal.io/api v1.26.1-0.20240103185939-608bdd111e4b | |||
There was a problem hiding this comment.
It looks like it's downgraded; or am I reading this wrong?
There was a problem hiding this comment.
It did not; we retracted the v1.26.1 version. It's... weird. I don't think Go handles it gracefully
stephanos
approved these changes
Jan 8, 2024
The DialContext function was altered in such a way that a non-blocking dial wouldn't see the context had been cancelled. This looks like what was intended all along, so we force the dial to block until the connection is established in order to force a test failure.
carlydf
approved these changes
Jan 8, 2024
tdeebswihart
added a commit
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
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 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