Skip to content

Conversation

@cwperks
Copy link
Member

@cwperks cwperks commented Sep 2, 2025

Description

This PR contains the following updates:

  • Bump io.projectreactor.netty:reactor_netty from 1.2.5 to 1.2.9
  • Bump org.bouncycastle:bouncycastle_jce from 2.0.0 to 2.1.1
  • Bump org.bouncycastle:bouncycastle_tls from 2.0.20 to 2.1.20
  • Bump org.bouncycastle:bouncycastle_pkix from 2.0.8 to 2.1.9
  • Bump org.bouncycastle:bouncycastle_pg from 2.0.11 to 2.1.11
  • Bump org.bouncycastle:bouncycastle_util from 2.0.3 to 2.1.4

Related Issues

Resolves CVE-2025-22227 and CVE-2025-8916

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.

@cwperks cwperks requested a review from a team as a code owner September 2, 2025 19:42
@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2025

❌ Gradle check result for 6f251c6: 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?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2025

❌ Gradle check result for c699e1c: 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

@reta reta left a comment

Choose a reason for hiding this comment

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

Thanks @cwperks !

Signed-off-by: Craig Perkins <[email protected]>
@cwperks
Copy link
Member Author

cwperks commented Sep 3, 2025

@reta I pushed a new commit because there are tests failing due to thread leak detection: https://build.ci.opensearch.org/job/gradle-check/63211/

The leaked threads are:

1) Thread[id=70, name=BC Disposal Daemon, state=WAITING, group=TGRP-PemUtilsTests]
2) Thread[id=78, name=BC Cleanup Executor, state=WAITING, group=TGRP-PemUtilsTests]

@github-actions
Copy link
Contributor

github-actions bot commented Sep 3, 2025

❌ Gradle check result for 2c9d269: 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?

@reta
Copy link
Contributor

reta commented Sep 3, 2025

@reta I pushed a new commit because there are tests failing due to thread leak detection: https://build.ci.opensearch.org/job/gradle-check/63211/

@cwperks by setting org.bouncycastle.native.cleanup_delay system property value to 0 we should be able to disable cleanup entirely.

@cwperks
Copy link
Member Author

cwperks commented Sep 3, 2025

@cwperks by setting org.bouncycastle.native.cleanup_delay system property value to 0 we should be able to disable cleanup entirely.

TY @reta. Pushed another commit to set this system prop in OpenSearchTestCase.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 3, 2025

❌ Gradle check result for a854320: 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?

@cwperks
Copy link
Member Author

cwperks commented Sep 3, 2025

@cwperks by setting org.bouncycastle.native.cleanup_delay system property value to 0 we should be able to disable cleanup entirely.

This didn't seem to work. Did I configure it correctly?

The ThreadFilter worked, but I needed to apply it to some more tests. Lmk which method would be preferable here.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2025

❌ Gradle check result for 697fb4c: 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?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2025

❌ Gradle check result for 1ac363d: 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?

@reta
Copy link
Contributor

reta commented Sep 4, 2025

❌ Gradle check result for 1ac363d: FAILURE

Hmm... needs more time :(, will take a look tomorrow

@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2025

❌ Gradle check result for dc011de: 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?

@reta
Copy link
Contributor

reta commented Sep 4, 2025

❌ Gradle check result for dc011de: FAILURE

@cwperks my apologies, I derailed you here, the change that actually disables BC cleanup turned out to be very recent and comes with the next release (2.1.2), sorry about that, I was very surprised as well to discover it.

The filter seems to be the only way for 2.1
1 to move forward, we could also stay om 2.0.x (it has all CVE fixes) and migrate to 2.1.x later on, as an option .

@cwperks
Copy link
Member Author

cwperks commented Sep 4, 2025

❌ Gradle check result for dc011de: FAILURE

@cwperks my apologies, I derailed you here, the change that actually disables BC cleanup turned out to be very recent and comes with the next release (2.1.2), sorry about that, I was very surprised as well to discover it.

The filter seems to be the only way for 2.1 1 to move forward, we could also stay om 2.0.x (it has all CVE fixes) and migrate to 2.1.x later on, as an option .

Thank you for checking @reta! I'll add the filter back in and create a GH issue to track its removal once 2.1.2 is released.

This reverts commit dc011de.

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2025

❌ Gradle check result for a7faba9: 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?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2025

❌ Gradle check result for a7faba9: null

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?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2025

❌ Gradle check result for a7faba9: 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?

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2025

✅ Gradle check result for a7faba9: SUCCESS

@codecov
Copy link

codecov bot commented Sep 5, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.82%. Comparing base (3f86407) to head (a7faba9).
⚠️ Report is 15 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #19222      +/-   ##
============================================
- Coverage     72.87%   72.82%   -0.05%     
+ Complexity    69698    69625      -73     
============================================
  Files          5656     5656              
  Lines        319999   319999              
  Branches      46335    46335              
============================================
- Hits         233207   233052     -155     
- Misses        67946    68083     +137     
- Partials      18846    18864      +18     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@cwperks
Copy link
Member Author

cwperks commented Sep 5, 2025

@reta would you mind re-approving?

@cwperks cwperks merged commit 53f428c into opensearch-project:main Sep 5, 2025
34 of 40 checks passed
kh3ra pushed a commit to kh3ra/OpenSearch that referenced this pull request Sep 9, 2025
…tty4 (opensearch-project#19222)

* Upgrade multiple deps including bc-fips jars and transport-reactor-netty4

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Create BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Create BouncyCastleThreadFilter"

This reverts commit 2c9d269.

Signed-off-by: Craig Perkins <[email protected]>

* Set org.bouncycastle.native.cleanup_delay to 0 for testing

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Revert "Create BouncyCastleThreadFilter""

This reverts commit dc011de.

Signed-off-by: Craig Perkins <[email protected]>

* Re-add BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
@cwperks cwperks mentioned this pull request Sep 10, 2025
3 tasks
jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Sep 22, 2025
…tty4 (opensearch-project#19222)

* Upgrade multiple deps including bc-fips jars and transport-reactor-netty4

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Create BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Create BouncyCastleThreadFilter"

This reverts commit 2c9d269.

Signed-off-by: Craig Perkins <[email protected]>

* Set org.bouncycastle.native.cleanup_delay to 0 for testing

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Revert "Create BouncyCastleThreadFilter""

This reverts commit dc011de.

Signed-off-by: Craig Perkins <[email protected]>

* Re-add BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Sep 22, 2025
…tty4 (opensearch-project#19222)

* Upgrade multiple deps including bc-fips jars and transport-reactor-netty4

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Create BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Create BouncyCastleThreadFilter"

This reverts commit 2c9d269.

Signed-off-by: Craig Perkins <[email protected]>

* Set org.bouncycastle.native.cleanup_delay to 0 for testing

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Revert "Create BouncyCastleThreadFilter""

This reverts commit dc011de.

Signed-off-by: Craig Perkins <[email protected]>

* Re-add BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Ankit Jain <[email protected]>
jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Sep 22, 2025
…tty4 (opensearch-project#19222)

* Upgrade multiple deps including bc-fips jars and transport-reactor-netty4

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Create BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Create BouncyCastleThreadFilter"

This reverts commit 2c9d269.

Signed-off-by: Craig Perkins <[email protected]>

* Set org.bouncycastle.native.cleanup_delay to 0 for testing

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Revert "Create BouncyCastleThreadFilter""

This reverts commit dc011de.

Signed-off-by: Craig Perkins <[email protected]>

* Re-add BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Ankit Jain <[email protected]>
asimmahmood1 pushed a commit to jainankitk/OpenSearch that referenced this pull request Sep 23, 2025
…tty4 (opensearch-project#19222)

* Upgrade multiple deps including bc-fips jars and transport-reactor-netty4

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Create BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Create BouncyCastleThreadFilter"

This reverts commit 2c9d269.

Signed-off-by: Craig Perkins <[email protected]>

* Set org.bouncycastle.native.cleanup_delay to 0 for testing

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Revert "Create BouncyCastleThreadFilter""

This reverts commit dc011de.

Signed-off-by: Craig Perkins <[email protected]>

* Re-add BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
pranikum pushed a commit to pranikum/OpenSearch that referenced this pull request Sep 23, 2025
…tty4 (opensearch-project#19222)

* Upgrade multiple deps including bc-fips jars and transport-reactor-netty4

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Create BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Create BouncyCastleThreadFilter"

This reverts commit 2c9d269.

Signed-off-by: Craig Perkins <[email protected]>

* Set org.bouncycastle.native.cleanup_delay to 0 for testing

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Revert "Create BouncyCastleThreadFilter""

This reverts commit dc011de.

Signed-off-by: Craig Perkins <[email protected]>

* Re-add BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
vinaykpud pushed a commit to vinaykpud/OpenSearch that referenced this pull request Sep 26, 2025
…tty4 (opensearch-project#19222)

* Upgrade multiple deps including bc-fips jars and transport-reactor-netty4

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Create BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Create BouncyCastleThreadFilter"

This reverts commit 2c9d269.

Signed-off-by: Craig Perkins <[email protected]>

* Set org.bouncycastle.native.cleanup_delay to 0 for testing

Signed-off-by: Craig Perkins <[email protected]>

* Revert "Revert "Create BouncyCastleThreadFilter""

This reverts commit dc011de.

Signed-off-by: Craig Perkins <[email protected]>

* Re-add BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
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.

2 participants