Skip to content
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.

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

[1.3] Version bump for protobuf, snappy-java #16792

Merged
merged 4 commits into from
Dec 6, 2024

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Dec 5, 2024

Description

Bumps protobuf-java to 3.25.5 (Resolves CVE-2024-7254)
Bumps snappy-java to 1.1.10.7 (Resolves CVE-2023-43642)

Check List

  • [ ] Functionality includes testing.
  • [ ] API changes companion pull request created, if applicable.
  • [ ] Public documentation issue/PR created, if applicable.

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.

@owaiskazi19
Copy link
Member

owaiskazi19 commented Dec 5, 2024

@dbwiddis You need to run ./gradlew updateSHAs to update the jars for the dependencies.

Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for e820f08: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@dbwiddis
Copy link
Member Author

dbwiddis commented Dec 5, 2024

Could not determine the dependencies of task ':plugins:repository-azure:thirdPartyAudit'.
> Could not resolve all files for configuration ':plugins:repository-azure:runtimeClasspath'.
   > Could not find com.azure:azure-storage-blob:12.18.1.
     Searched in the following locations:
       - https://repo.maven.apache.org/maven2/com/azure/azure-storage-blob/12.18.1/azure-storage-blob-12.18.1.pom

But it's there: https://central.sonatype.com/artifact/com.azure/azure-storage-blob/versions

EDIT: I'm blind it's 28, not 18

Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for eb8e5c1: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for 2e930e8: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for 8c54edc: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@dbwiddis
Copy link
Member Author

dbwiddis commented Dec 5, 2024

I'll revert the azure-storage bump as it seems more complicated. Depends on azure-storage-commons but they have different versions and still getting errors bumping both.

@dbwiddis dbwiddis force-pushed the version-bump-cve branch 2 times, most recently from cff7cfe to 4314354 Compare December 5, 2024 19:28
Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for e560c3d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@dbwiddis
Copy link
Member Author

dbwiddis commented Dec 5, 2024

Going to back out the commons-compress changes as well as they run afoul of tika.

I'm going to need help from other maintainers on the commons-compress and azure-storage blob CVEs
CC: @andrross @reta

Signed-off-by: Daniel Widdis <[email protected]>
@dbwiddis dbwiddis changed the title [1.3] Version bump for commons-compress, protobuf, hadoop, snappy-java [1.3] Version bump for protobuf, hadoop, snappy-java Dec 5, 2024
Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for 17b39a9: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@dbwiddis dbwiddis force-pushed the version-bump-cve branch 3 times, most recently from 1857d76 to 4d2585d Compare December 5, 2024 23:13
Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for 51aa9c9: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for 1857d76: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for 4d2585d: ABORTED

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Dec 5, 2024

❌ Gradle check result for 2cd664a: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@dbwiddis dbwiddis marked this pull request as draft December 6, 2024 00:16
Signed-off-by: Daniel Widdis <[email protected]>
Signed-off-by: Daniel Widdis <[email protected]>
Signed-off-by: Daniel Widdis <[email protected]>
Copy link
Contributor

github-actions bot commented Dec 6, 2024

❌ Gradle check result for 2cd664a: ABORTED

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Dec 6, 2024

✅ Gradle check result for 0862d49: SUCCESS

Copy link

codecov bot commented Dec 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.65%. Comparing base (05f4aac) to head (0862d49).
Report is 38 commits behind head on 1.3.

Additional details and impacted files
@@             Coverage Diff              @@
##                1.3   #16792      +/-   ##
============================================
+ Coverage     77.56%   77.65%   +0.08%     
- Complexity    58760    58798      +38     
============================================
  Files          4223     4223              
  Lines        253441   253459      +18     
  Branches      38701    38692       -9     
============================================
+ Hits         196590   196831     +241     
+ Misses        40844    40631     -213     
+ Partials      16007    15997      -10     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta
Copy link
Collaborator

reta commented Dec 6, 2024

I'm going to need help from other maintainers on the commons-compress and azure-storage blob CVEs
CC: @andrross @reta

Seems like you pulled it off @dbwiddis ? thanks!
UPD: Oh I see commons-compres is out, will surely help you out

@dbwiddis dbwiddis marked this pull request as ready for review December 6, 2024 05:59
@dbwiddis
Copy link
Member Author

dbwiddis commented Dec 6, 2024

OK, 2 out of 5 bumps is better than 0.

@dbwiddis
Copy link
Member Author

dbwiddis commented Dec 6, 2024

Seems like you pulled it off @dbwiddis ? thanks! UPD: Oh I see commons-compres is out, will surely help you out

I only managed to get protobuf and snappy-java.

commons-compress runs afoul of tika on ingest.
azure-storage-blob requires a lot more transitive dependencies and fails container tests that don't exist in 2.x.
hadoop-minicluster fails on some hdfs tests.

I don't know how many are solvable or if we should mark the CVEs as "not fixable due to backwards compatibility" but I hope others with more experience with them (and the 2.x bumps) can advise.

@dbwiddis dbwiddis changed the title [1.3] Version bump for protobuf, hadoop, snappy-java [1.3] Version bump for protobuf, snappy-java Dec 6, 2024
@dbwiddis dbwiddis merged commit 9e291ce into opensearch-project:1.3 Dec 6, 2024
22 of 23 checks passed
@dbwiddis dbwiddis deleted the version-bump-cve branch December 6, 2024 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants