Skip to content

Bump armeria + grpc + protobuf to fix CVE-2024-7254#5891

Merged
dlvenable merged 3 commits intoopensearch-project:mainfrom
KarstenSchnitter:CVE-2024-7254
Jul 30, 2025
Merged

Bump armeria + grpc + protobuf to fix CVE-2024-7254#5891
dlvenable merged 3 commits intoopensearch-project:mainfrom
KarstenSchnitter:CVE-2024-7254

Conversation

@KarstenSchnitter
Copy link
Copy Markdown
Collaborator

Description

Upgrades protobuf dependencies with versions that fix CVE-2024-7254.

Issues Resolved

Resolves #5890

Check List

  • New functionality includes testing.
  • New functionality has a documentation issue. Please link to it in this PR.
    • New functionality has javadoc added
  • Commits are signed with a real name per the DCO

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@dlvenable
Copy link
Copy Markdown
Member

@KarstenSchnitter , Thank you for this contribution!

To fix the failing tests, try changing the mock annotations for the final classes to: @Mock(mockMaker = MockMakers.INLINE)

KarstenSchnitter and others added 2 commits July 30, 2025 10:37
Upgrades protobuf dependencies with versions that fix
CVE-2024-7254.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
…g final classes.

Signed-off-by: David Venable <dlv@amazon.com>
… to the Armeria test library. Enforce a consistent JUnit version across the project to avoid JUnit consistency issues.

Signed-off-by: David Venable <dlv@amazon.com>
Copy link
Copy Markdown
Member

@dlvenable dlvenable left a comment

Choose a reason for hiding this comment

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

I made some changes to get this to work. Thanks @KarstenSchnitter !

@dlvenable dlvenable merged commit 292a547 into opensearch-project:main Jul 30, 2025
84 of 92 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 30, 2025
Bump armeria + grpc + protobuf to fix CVE-2024-7254

Upgrades protobuf dependencies with versions that fix
Fixes CVE-2024-7254.

Use inline mocks in DnsPeerListProviderCreationTest to support mocking final classes. Updates to the GrpcRequestExceptionHandlerTest required by the update to the Armeria test library. Enforce a consistent JUnit version across the project to avoid JUnit consistency issues.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Signed-off-by: David Venable <dlv@amazon.com>
Co-authored-by: David Venable <dlv@amazon.com>
(cherry picked from commit 292a547)
dlvenable added a commit that referenced this pull request Jul 30, 2025
Bump armeria + grpc + protobuf to fix CVE-2024-7254

Upgrades protobuf dependencies with versions that fix
Fixes CVE-2024-7254.

Use inline mocks in DnsPeerListProviderCreationTest to support mocking final classes. Updates to the GrpcRequestExceptionHandlerTest required by the update to the Armeria test library. Enforce a consistent JUnit version across the project to avoid JUnit consistency issues.




(cherry picked from commit 292a547)

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Signed-off-by: David Venable <dlv@amazon.com>
Co-authored-by: Karsten Schnitter <k.schnitter@sap.com>
Co-authored-by: David Venable <dlv@amazon.com>
@KarstenSchnitter
Copy link
Copy Markdown
Collaborator Author

@dlvenable thanks for picking this up. I did not manage to get these changes working locally. For some reason the tests failed when I tried. Thanks also for backporting this. Any plan on a release containing this fix?

@KarstenSchnitter KarstenSchnitter deleted the CVE-2024-7254 branch August 1, 2025 07:55
@dlvenable
Copy link
Copy Markdown
Member

@KarstenSchnitter , I'd like to get a release out next week.

@dlvenable
Copy link
Copy Markdown
Member

@KarstenSchnitter , Data Prepper 2.12.1 is now available.

#5970

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] CVE-2024-7254 in com.google.protobuf:protobuf-java (caused by com.linecorp.armeria:armeria-grpc)

4 participants