diff --git a/CHANGELOG.md b/CHANGELOG.md index fb677cdc81d03..f7ea91fe0eac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump Slf4j from 1.7.36 to 2.0.17 ([#19136](https://github.com/opensearch-project/OpenSearch/pull/19136)) - Bump `org.apache.tika` from 2.9.2 to 3.2.2 ([#19125](https://github.com/opensearch-project/OpenSearch/pull/19125)) - Bump `org.apache.commons:commons-compress` from 1.26.1 to 1.28.0 ([#19125](https://github.com/opensearch-project/OpenSearch/pull/19125)) +- Bump `io.projectreactor.netty:reactor_netty` from `1.2.5` to `1.2.9` ([#19222](https://github.com/opensearch-project/OpenSearch/pull/19222)) +- Bump `org.bouncycastle:bouncycastle_jce` from `2.0.0` to `2.1.1` ([#19222](https://github.com/opensearch-project/OpenSearch/pull/19222)) +- Bump `org.bouncycastle:bouncycastle_tls` from `2.0.20` to `2.1.20` ([#19222](https://github.com/opensearch-project/OpenSearch/pull/19222)) +- Bump `org.bouncycastle:bouncycastle_pkix` from `2.0.8` to `2.1.9` ([#19222](https://github.com/opensearch-project/OpenSearch/pull/19222)) +- Bump `org.bouncycastle:bouncycastle_pg` from `2.0.11` to `2.1.11` ([#19222](https://github.com/opensearch-project/OpenSearch/pull/19222)) +- Bump `org.bouncycastle:bouncycastle_util` from `2.0.3` to `2.1.4` ([#19222](https://github.com/opensearch-project/OpenSearch/pull/19222)) - Bump `com.azure:azure-core` from 1.55.5 to 1.56.0 ([#19206](https://github.com/opensearch-project/OpenSearch/pull/19206)) - Bump `com.google.cloud:google-cloud-core` from 2.59.0 to 2.60.0 ([#19208](https://github.com/opensearch-project/OpenSearch/pull/19208)) - Bump `org.jsoup:jsoup` from 1.20.1 to 1.21.2 ([#19207](https://github.com/opensearch-project/OpenSearch/pull/19207)) diff --git a/client/rest/licenses/bc-fips-2.0.0.jar.sha1 b/client/rest/licenses/bc-fips-2.0.0.jar.sha1 deleted file mode 100644 index 79f0e3e9930bb..0000000000000 --- a/client/rest/licenses/bc-fips-2.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab \ No newline at end of file diff --git a/client/rest/licenses/bc-fips-2.1.1.jar.sha1 b/client/rest/licenses/bc-fips-2.1.1.jar.sha1 new file mode 100644 index 0000000000000..831a41da72aa5 --- /dev/null +++ b/client/rest/licenses/bc-fips-2.1.1.jar.sha1 @@ -0,0 +1 @@ +34c72d0367d41672883283933ebec24843570bf5 \ No newline at end of file diff --git a/client/rest/licenses/bctls-fips-2.0.20.jar.sha1 b/client/rest/licenses/bctls-fips-2.0.20.jar.sha1 deleted file mode 100644 index 66cd82b49b537..0000000000000 --- a/client/rest/licenses/bctls-fips-2.0.20.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1138f7896e0d1bb0d924bc868ed2dfda4f69470e \ No newline at end of file diff --git a/client/rest/licenses/bctls-fips-2.1.20.jar.sha1 b/client/rest/licenses/bctls-fips-2.1.20.jar.sha1 new file mode 100644 index 0000000000000..7266ec5abf10a --- /dev/null +++ b/client/rest/licenses/bctls-fips-2.1.20.jar.sha1 @@ -0,0 +1 @@ +9c0632a6c5ca09a86434cf5e02e72c221e1c930f \ No newline at end of file diff --git a/client/rest/licenses/bcutil-fips-2.0.3.jar.sha1 b/client/rest/licenses/bcutil-fips-2.0.3.jar.sha1 deleted file mode 100644 index d553536576656..0000000000000 --- a/client/rest/licenses/bcutil-fips-2.0.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a1857cd639295b10cc90e6d31ecbc523cdafcc19 \ No newline at end of file diff --git a/client/rest/licenses/bcutil-fips-2.1.4.jar.sha1 b/client/rest/licenses/bcutil-fips-2.1.4.jar.sha1 new file mode 100644 index 0000000000000..73b19722430fb --- /dev/null +++ b/client/rest/licenses/bcutil-fips-2.1.4.jar.sha1 @@ -0,0 +1 @@ +1d37b7a28560684f5b8e4fd65478c9130d4015d0 \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/bc-fips-2.0.0.jar.sha1 b/distribution/tools/plugin-cli/licenses/bc-fips-2.0.0.jar.sha1 deleted file mode 100644 index 79f0e3e9930bb..0000000000000 --- a/distribution/tools/plugin-cli/licenses/bc-fips-2.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/bc-fips-2.1.1.jar.sha1 b/distribution/tools/plugin-cli/licenses/bc-fips-2.1.1.jar.sha1 new file mode 100644 index 0000000000000..831a41da72aa5 --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/bc-fips-2.1.1.jar.sha1 @@ -0,0 +1 @@ +34c72d0367d41672883283933ebec24843570bf5 \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/bcpg-fips-2.0.11.jar.sha1 b/distribution/tools/plugin-cli/licenses/bcpg-fips-2.0.11.jar.sha1 deleted file mode 100644 index 39805c3a32614..0000000000000 --- a/distribution/tools/plugin-cli/licenses/bcpg-fips-2.0.11.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19f38a0d8048e87039b1bb6c1ba4d2b104891d04 \ No newline at end of file diff --git a/distribution/tools/plugin-cli/licenses/bcpg-fips-2.1.11.jar.sha1 b/distribution/tools/plugin-cli/licenses/bcpg-fips-2.1.11.jar.sha1 new file mode 100644 index 0000000000000..09bc4760767a1 --- /dev/null +++ b/distribution/tools/plugin-cli/licenses/bcpg-fips-2.1.11.jar.sha1 @@ -0,0 +1 @@ +727e087a843f3a5a8143e4f3a7518c8c3517df18 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d0e2d31f0baf..fc248739ecd88 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,7 +38,7 @@ joda = "2.12.7" roaringbitmap = "1.3.0" # project reactor -reactor_netty = "1.2.5" +reactor_netty = "1.2.9" reactor = "3.7.5" # client dependencies @@ -61,11 +61,11 @@ hadoop3 = "3.3.6" # when updating this version, you need to ensure compatibility with: # - plugins/ingest-attachment (transitive dependency, check the upstream POM) # - distribution/tools/plugin-cli -bouncycastle_jce = "2.0.0" -bouncycastle_tls = "2.0.20" -bouncycastle_pkix = "2.0.8" -bouncycastle_pg = "2.0.11" -bouncycastle_util = "2.0.3" +bouncycastle_jce = "2.1.1" +bouncycastle_tls = "2.1.20" +bouncycastle_pkix = "2.1.9" +bouncycastle_pg = "2.1.11" +bouncycastle_util = "2.1.4" password4j = "1.8.3" # test dependencies diff --git a/libs/ssl-config/licenses/bc-fips-2.0.0.jar.sha1 b/libs/ssl-config/licenses/bc-fips-2.0.0.jar.sha1 deleted file mode 100644 index 79f0e3e9930bb..0000000000000 --- a/libs/ssl-config/licenses/bc-fips-2.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab \ No newline at end of file diff --git a/libs/ssl-config/licenses/bc-fips-2.1.1.jar.sha1 b/libs/ssl-config/licenses/bc-fips-2.1.1.jar.sha1 new file mode 100644 index 0000000000000..831a41da72aa5 --- /dev/null +++ b/libs/ssl-config/licenses/bc-fips-2.1.1.jar.sha1 @@ -0,0 +1 @@ +34c72d0367d41672883283933ebec24843570bf5 \ No newline at end of file diff --git a/libs/ssl-config/licenses/bcpkix-fips-2.0.8.jar.sha1 b/libs/ssl-config/licenses/bcpkix-fips-2.0.8.jar.sha1 deleted file mode 100644 index 69293a600d472..0000000000000 --- a/libs/ssl-config/licenses/bcpkix-fips-2.0.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aad7b0fcf55892e7ff7e2d23a290f143f4bb56e0 \ No newline at end of file diff --git a/libs/ssl-config/licenses/bcpkix-fips-2.1.9.jar.sha1 b/libs/ssl-config/licenses/bcpkix-fips-2.1.9.jar.sha1 new file mode 100644 index 0000000000000..59bfe1be614c9 --- /dev/null +++ b/libs/ssl-config/licenses/bcpkix-fips-2.1.9.jar.sha1 @@ -0,0 +1 @@ +722eaefa83fd8c53e1fc019bde25e353258ed22b \ No newline at end of file diff --git a/libs/ssl-config/licenses/bctls-fips-2.0.20.jar.sha1 b/libs/ssl-config/licenses/bctls-fips-2.0.20.jar.sha1 deleted file mode 100644 index 66cd82b49b537..0000000000000 --- a/libs/ssl-config/licenses/bctls-fips-2.0.20.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1138f7896e0d1bb0d924bc868ed2dfda4f69470e \ No newline at end of file diff --git a/libs/ssl-config/licenses/bctls-fips-2.1.20.jar.sha1 b/libs/ssl-config/licenses/bctls-fips-2.1.20.jar.sha1 new file mode 100644 index 0000000000000..7266ec5abf10a --- /dev/null +++ b/libs/ssl-config/licenses/bctls-fips-2.1.20.jar.sha1 @@ -0,0 +1 @@ +9c0632a6c5ca09a86434cf5e02e72c221e1c930f \ No newline at end of file diff --git a/libs/ssl-config/licenses/bcutil-fips-2.0.3.jar.sha1 b/libs/ssl-config/licenses/bcutil-fips-2.0.3.jar.sha1 deleted file mode 100644 index d553536576656..0000000000000 --- a/libs/ssl-config/licenses/bcutil-fips-2.0.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a1857cd639295b10cc90e6d31ecbc523cdafcc19 \ No newline at end of file diff --git a/libs/ssl-config/licenses/bcutil-fips-2.1.4.jar.sha1 b/libs/ssl-config/licenses/bcutil-fips-2.1.4.jar.sha1 new file mode 100644 index 0000000000000..73b19722430fb --- /dev/null +++ b/libs/ssl-config/licenses/bcutil-fips-2.1.4.jar.sha1 @@ -0,0 +1 @@ +1d37b7a28560684f5b8e4fd65478c9130d4015d0 \ No newline at end of file diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java index 51e69a758ad44..2adf8d02cced0 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java @@ -32,6 +32,9 @@ package org.opensearch.common.ssl; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; + +import org.opensearch.test.BouncyCastleThreadFilter; import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; @@ -55,6 +58,7 @@ import static org.hamcrest.Matchers.iterableWithSize; import static org.hamcrest.Matchers.notNullValue; +@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class) public class PemKeyConfigTests extends OpenSearchTestCase { private static final int IP_NAME = 7; private static final int DNS_NAME = 2; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java index 05bf4dd194b00..8f0f3da84535e 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java @@ -32,6 +32,9 @@ package org.opensearch.common.ssl; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; + +import org.opensearch.test.BouncyCastleThreadFilter; import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; @@ -51,6 +54,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class) public class PemTrustConfigTests extends OpenSearchTestCase { public void testBuildTrustConfigFromSinglePemFile() throws Exception { diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java index 1ac3d5ea54682..f869574f7c5ed 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java @@ -32,8 +32,11 @@ package org.opensearch.common.ssl; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; + import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; +import org.opensearch.test.BouncyCastleThreadFilter; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -56,6 +59,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.StringContains.containsString; +@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class) public class PemUtilsTests extends OpenSearchTestCase { private static final Supplier EMPTY_PASSWORD = () -> new char[0]; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java index 366e936ca4852..32e5c5749d869 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java @@ -32,9 +32,12 @@ package org.opensearch.common.ssl; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; + import org.opensearch.common.settings.MockSecureSettings; import org.opensearch.common.settings.Settings; import org.opensearch.core.common.settings.SecureString; +import org.opensearch.test.BouncyCastleThreadFilter; import org.opensearch.test.OpenSearchTestCase; import javax.net.ssl.KeyManagerFactory; @@ -51,6 +54,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; +@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class) public class SslConfigurationLoaderTests extends OpenSearchTestCase { private final String STRONG_PRIVATE_SECRET = "6!6428DQXwPpi7@$ggeg/="; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java index 31a4082f0609a..6454dfd81ca3f 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java @@ -32,7 +32,10 @@ package org.opensearch.common.ssl; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; + import org.opensearch.common.Nullable; +import org.opensearch.test.BouncyCastleThreadFilter; import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; @@ -59,6 +62,7 @@ import org.mockito.Mockito; +@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class) public class SslDiagnosticsTests extends OpenSearchTestCase { // Some constants for use in mock certificates diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index 170f89838dd0d..db7c9110f8d8c 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -32,6 +32,8 @@ package org.opensearch.index.reindex; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; + import com.sun.net.httpserver.HttpsConfigurator; import com.sun.net.httpserver.HttpsExchange; import com.sun.net.httpserver.HttpsParameters; @@ -48,6 +50,7 @@ import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; +import org.opensearch.test.BouncyCastleThreadFilter; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.watcher.ResourceWatcherService; import org.hamcrest.Matchers; @@ -82,6 +85,7 @@ * right SSL keys + trust settings. */ @SuppressForbidden(reason = "use http server") +@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class) public class ReindexRestClientSslTests extends OpenSearchTestCase { private static final String STRONG_PRIVATE_SECRET = "6!6428DQXwPpi7@$ggeg/="; diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.2.5.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.2.5.jar.sha1 deleted file mode 100644 index f2ac5ea0bfdd9..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-core-1.2.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -42af645f3cfc221f74573103773a9def598d2231 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.2.9.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.2.9.jar.sha1 new file mode 100644 index 0000000000000..3e9f1ad95ac41 --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-core-1.2.9.jar.sha1 @@ -0,0 +1 @@ +aa1979804ad9f8e3b59f60681bfd2400a16d7b9b \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.2.5.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.2.5.jar.sha1 deleted file mode 100644 index 7aef5b62e29da..0000000000000 --- a/plugins/repository-azure/licenses/reactor-netty-http-1.2.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3f2a54919a1e15ca9543380b045ba54ca4e57cc \ No newline at end of file diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.2.9.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.2.9.jar.sha1 new file mode 100644 index 0000000000000..ba3b94e56e29e --- /dev/null +++ b/plugins/repository-azure/licenses/reactor-netty-http-1.2.9.jar.sha1 @@ -0,0 +1 @@ +aea5b2eb6f1cb9a933a4c97745291ffc34ec10d6 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.5.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.5.jar.sha1 deleted file mode 100644 index f2ac5ea0bfdd9..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -42af645f3cfc221f74573103773a9def598d2231 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.9.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.9.jar.sha1 new file mode 100644 index 0000000000000..3e9f1ad95ac41 --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.2.9.jar.sha1 @@ -0,0 +1 @@ +aa1979804ad9f8e3b59f60681bfd2400a16d7b9b \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.5.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.5.jar.sha1 deleted file mode 100644 index 7aef5b62e29da..0000000000000 --- a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3f2a54919a1e15ca9543380b045ba54ca4e57cc \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.9.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.9.jar.sha1 new file mode 100644 index 0000000000000..ba3b94e56e29e --- /dev/null +++ b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.2.9.jar.sha1 @@ -0,0 +1 @@ +aea5b2eb6f1cb9a933a4c97745291ffc34ec10d6 \ No newline at end of file diff --git a/plugins/transport-reactor-netty4/src/test/java/org/opensearch/http/reactor/netty4/ssl/SecureReactorNetty4HttpServerTransportTests.java b/plugins/transport-reactor-netty4/src/test/java/org/opensearch/http/reactor/netty4/ssl/SecureReactorNetty4HttpServerTransportTests.java index 2644cc56187ae..c5f1e6215f098 100644 --- a/plugins/transport-reactor-netty4/src/test/java/org/opensearch/http/reactor/netty4/ssl/SecureReactorNetty4HttpServerTransportTests.java +++ b/plugins/transport-reactor-netty4/src/test/java/org/opensearch/http/reactor/netty4/ssl/SecureReactorNetty4HttpServerTransportTests.java @@ -8,6 +8,8 @@ package org.opensearch.http.reactor.netty4.ssl; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; + import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.common.network.NetworkAddress; import org.opensearch.common.network.NetworkService; @@ -35,6 +37,7 @@ import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; import org.opensearch.telemetry.tracing.noop.NoopTracer; +import org.opensearch.test.BouncyCastleThreadFilter; import org.opensearch.test.KeyStoreUtils; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestRequest; @@ -97,6 +100,7 @@ /** * Tests for the secure {@link ReactorNetty4HttpServerTransport} class. */ +@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class) public class SecureReactorNetty4HttpServerTransportTests extends OpenSearchTestCase { private NetworkService networkService; diff --git a/test/framework/licenses/bc-fips-2.0.0.jar.sha1 b/test/framework/licenses/bc-fips-2.0.0.jar.sha1 deleted file mode 100644 index 79f0e3e9930bb..0000000000000 --- a/test/framework/licenses/bc-fips-2.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab \ No newline at end of file diff --git a/test/framework/licenses/bc-fips-2.1.1.jar.sha1 b/test/framework/licenses/bc-fips-2.1.1.jar.sha1 new file mode 100644 index 0000000000000..831a41da72aa5 --- /dev/null +++ b/test/framework/licenses/bc-fips-2.1.1.jar.sha1 @@ -0,0 +1 @@ +34c72d0367d41672883283933ebec24843570bf5 \ No newline at end of file diff --git a/test/framework/licenses/bcpkix-fips-2.0.8.jar.sha1 b/test/framework/licenses/bcpkix-fips-2.0.8.jar.sha1 deleted file mode 100644 index 69293a600d472..0000000000000 --- a/test/framework/licenses/bcpkix-fips-2.0.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aad7b0fcf55892e7ff7e2d23a290f143f4bb56e0 \ No newline at end of file diff --git a/test/framework/licenses/bcpkix-fips-2.1.9.jar.sha1 b/test/framework/licenses/bcpkix-fips-2.1.9.jar.sha1 new file mode 100644 index 0000000000000..59bfe1be614c9 --- /dev/null +++ b/test/framework/licenses/bcpkix-fips-2.1.9.jar.sha1 @@ -0,0 +1 @@ +722eaefa83fd8c53e1fc019bde25e353258ed22b \ No newline at end of file diff --git a/test/framework/licenses/bcutil-fips-2.0.3.jar.sha1 b/test/framework/licenses/bcutil-fips-2.0.3.jar.sha1 deleted file mode 100644 index d553536576656..0000000000000 --- a/test/framework/licenses/bcutil-fips-2.0.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a1857cd639295b10cc90e6d31ecbc523cdafcc19 \ No newline at end of file diff --git a/test/framework/licenses/bcutil-fips-2.1.4.jar.sha1 b/test/framework/licenses/bcutil-fips-2.1.4.jar.sha1 new file mode 100644 index 0000000000000..73b19722430fb --- /dev/null +++ b/test/framework/licenses/bcutil-fips-2.1.4.jar.sha1 @@ -0,0 +1 @@ +1d37b7a28560684f5b8e4fd65478c9130d4015d0 \ No newline at end of file diff --git a/test/framework/src/main/java/org/opensearch/test/BouncyCastleThreadFilter.java b/test/framework/src/main/java/org/opensearch/test/BouncyCastleThreadFilter.java new file mode 100644 index 0000000000000..ed238fa40ba64 --- /dev/null +++ b/test/framework/src/main/java/org/opensearch/test/BouncyCastleThreadFilter.java @@ -0,0 +1,23 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ + +package org.opensearch.test; + +import com.carrotsearch.randomizedtesting.ThreadFilter; + +/** + * ThreadFilter to exclude ThreadLeak checks for BC’s global background threads + */ +public class BouncyCastleThreadFilter implements ThreadFilter { + @Override + public boolean reject(Thread t) { + String n = t.getName(); + // Ignore BC’s global background threads + return "BC Disposal Daemon".equals(n) || "BC Cleanup Executor".equals(n); + } +}