Skip to content

Update netty version to fix CVE-2021-21290 #7939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kwart wants to merge 2 commits into from
Closed

Update netty version to fix CVE-2021-21290 #7939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c10d731
Update netty version to fix CVE-2021-21290
kwart Mar 4, 2021
e70c0ec
Fix OkHttpTransportTest after the Netty upgrade
kwart Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ subprojects {
protocPluginBaseName = 'protoc-gen-grpc-java'
javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix"

nettyVersion = '4.1.52.Final'
nettyVersion = '4.1.59.Final'
guavaVersion = '30.0-android'
googleauthVersion = '0.22.2'
protobufVersion = '3.12.0'
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/io/grpc/internal/AbstractTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,7 +1920,8 @@ public void serverChecksInboundMetadataSize() throws Exception {
// If this times out, the server probably isn't noticing the metadata size
Status status = clientStreamListener.status.get(TIMEOUT_MS, TimeUnit.MILLISECONDS);
List<Status.Code> codeOptions = Arrays.asList(
Status.Code.UNKNOWN, Status.Code.RESOURCE_EXHAUSTED, Status.Code.INTERNAL);
Status.Code.UNKNOWN, Status.Code.RESOURCE_EXHAUSTED, Status.Code.INTERNAL,
Status.Code.UNAVAILABLE);
Copy link
Copy Markdown
Member

@ejona86 ejona86 Mar 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd need to look into why a new status code is being used. That may be a bug.

if (!codeOptions.contains(status.getCode())) {
fail("Status code was not expected: " + status);
}
Expand Down
6 changes: 0 additions & 6 deletions okhttp/src/test/java/io/grpc/okhttp/OkHttpTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,4 @@ protected boolean haveTransportTracer() {
return true;
}

@Override
@org.junit.Test
@org.junit.Ignore
public void clientChecksInboundMetadataSize_trailer() {
Copy link
Copy Markdown
Member

@ejona86 ejona86 Mar 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this could be made separately, since it actually has nothing to do with this particular upgrade of Netty.

// Server-side is flaky due to https://github.com/netty/netty/pull/8332
}
}