Update Netty to 4.1.117.Final (opensearch-project#17041)

Signed-off-by: Andriy Redko <[email protected]> (cherry picked from commit e6fc600) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Andriy Redko <[email protected]>
reta · Jan 27, 2025 · c845c46 · c845c46
1 parent 83db397
commit c845c46
Show file tree

Hide file tree

Showing 59 changed files with 49 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Added
 ### Dependencies
+- Bump `Netty` from 4.1.115.Final to 4.1.117.Final ([#17041](https://github.com/opensearch-project/OpenSearch/pull/17041))
+
 ### Changed
 ### Deprecated
 ### Removed

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -26,7 +26,7 @@ protobuf          = 3.25.5
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.5.0
 
-netty             = 4.1.115.Final
+netty             = 4.1.117.Final
 reactor_netty     = 1.0.39
 reactor           = 3.4.34
 joda              = 2.12.2

diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.115.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.115.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+022b4cc28194cb23671274499229e0ef35028fbd
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.115.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.115.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+2831d3431ed93d9c0b64b1c0cce2ced4737539aa
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.115.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.115.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+5a0f8cd908b8b09b2cd1d39c1d2086a4d12e6029
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.115.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.115.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+9e074a4382f56b37f3b9ee1fc21d53e7af58ec9d
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.115.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.115.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+db14cd99515f8c98a3f2a347718e59f14d85c503
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.115.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.115.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+581b37489a03162f473264b65f53d504269a74b0
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.115.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.115.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+f81d72962bd134d8d8e11b514321134fa5fd0ce6
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.115.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.115.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+684f2316ff2b2171babbc17c95ac3bd97f5f091e
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.115.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.115.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+5023de39015bdc7a5740dcae109fb0a72160c207
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.115.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.115.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+e0a678ac80e00b08a4c0118d496efabc4516ebbf
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.115.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.115.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+c7e72e5ec8e349e15e2d38811696f6404e0a49e0
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.115.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.115.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+f032fb832d421d9906c705a1d328188723961c74
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.115.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.115.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+54c433e75a6e0f101ac78332a9958cd200ca2434
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.115.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.115.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+684f2316ff2b2171babbc17c95ac3bd97f5f091e
diff --git a/...repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageService.java b/...repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageService.java
@@ -68,7 +68,9 @@
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;
 import java.net.URISyntaxException;
+import java.security.AccessController;
 import java.security.InvalidKeyException;
+import java.security.PrivilegedAction;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
@@ -397,7 +399,16 @@ private static class NioThreadFactory implements ThreadFactory {
         }
 
         public Thread newThread(Runnable r) {
-            final Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
+            final Thread t = new Thread(group, new Runnable() {
+                @SuppressWarnings({ "deprecation", "removal" })
+                @Override
+                public void run() {
+                    AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+                        r.run();
+                        return null;
+                    });
+                }
+            }, namePrefix + threadNumber.getAndIncrement(), 0);
 
             if (t.isDaemon()) {
                 t.setDaemon(false);

diff --git a/plugins/repository-azure/src/main/plugin-metadata/plugin-security.policy b/plugins/repository-azure/src/main/plugin-metadata/plugin-security.policy
@@ -38,6 +38,7 @@ grant {
   permission java.lang.RuntimePermission "accessDeclaredMembers";
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
   permission java.lang.RuntimePermission "setContextClassLoader";
+  permission java.lang.RuntimePermission "getClassLoader";
 
   // azure client set Authenticator for proxy username/password
   permission java.net.NetPermission "setDefaultAuthenticator";

diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.115.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.115.Final.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.117.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+61dfea8203f3b653e79959bc259adf848b998d8c
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.115.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.115.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.117.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+022b4cc28194cb23671274499229e0ef35028fbd
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.115.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.115.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.117.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+2831d3431ed93d9c0b64b1c0cce2ced4737539aa
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.115.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.115.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.117.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+5a0f8cd908b8b09b2cd1d39c1d2086a4d12e6029
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.115.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.115.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.117.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+9e074a4382f56b37f3b9ee1fc21d53e7af58ec9d
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.115.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.115.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.117.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+db14cd99515f8c98a3f2a347718e59f14d85c503
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.115.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.115.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.117.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+581b37489a03162f473264b65f53d504269a74b0
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.115.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.115.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.117.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+f81d72962bd134d8d8e11b514321134fa5fd0ce6
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+022b4cc28194cb23671274499229e0ef35028fbd
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+2831d3431ed93d9c0b64b1c0cce2ced4737539aa
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+5023de39015bdc7a5740dcae109fb0a72160c207
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+5a0f8cd908b8b09b2cd1d39c1d2086a4d12e6029
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+e0a678ac80e00b08a4c0118d496efabc4516ebbf
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+9e074a4382f56b37f3b9ee1fc21d53e7af58ec9d
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+db14cd99515f8c98a3f2a347718e59f14d85c503
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+581b37489a03162f473264b65f53d504269a74b0
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+54c433e75a6e0f101ac78332a9958cd200ca2434
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+f81d72962bd134d8d8e11b514321134fa5fd0ce6
diff --git a/...ansport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1 b/...ansport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1
@@ -0,0 +1 @@
+684f2316ff2b2171babbc17c95ac3bd97f5f091e