[fix][sec] Upgrade Netty to 4.1.100 to address CVE-2023-44487 (#21397)

(cherry picked from commit aae6c71)
apache · Dec 14, 2023 · 2f00fb9 · 2f00fb9
1 parent 0dd8545
commit 2f00fb9
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -352,24 +352,24 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-compress-1.21.jar
     - org.apache.commons-commons-lang3-3.11.jar
  * Netty
-    - io.netty-netty-buffer-4.1.93.Final.jar
-    - io.netty-netty-codec-4.1.93.Final.jar
-    - io.netty-netty-codec-dns-4.1.93.Final.jar
-    - io.netty-netty-codec-http-4.1.93.Final.jar
-    - io.netty-netty-codec-http2-4.1.93.Final.jar
-    - io.netty-netty-codec-socks-4.1.93.Final.jar
-    - io.netty-netty-codec-haproxy-4.1.93.Final.jar
-    - io.netty-netty-common-4.1.93.Final.jar
-    - io.netty-netty-handler-4.1.93.Final.jar
-    - io.netty-netty-handler-proxy-4.1.93.Final.jar
-    - io.netty-netty-resolver-4.1.93.Final.jar
-    - io.netty-netty-resolver-dns-4.1.93.Final.jar
-    - io.netty-netty-transport-4.1.93.Final.jar
-    - io.netty-netty-transport-classes-epoll-4.1.93.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar
-    - io.netty-netty-transport-native-epoll-4.1.93.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.93.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.93.Final-linux-x86_64.jar
+    - io.netty-netty-buffer-4.1.100.Final.jar
+    - io.netty-netty-codec-4.1.100.Final.jar
+    - io.netty-netty-codec-dns-4.1.100.Final.jar
+    - io.netty-netty-codec-http-4.1.100.Final.jar
+    - io.netty-netty-codec-http2-4.1.100.Final.jar
+    - io.netty-netty-codec-socks-4.1.100.Final.jar
+    - io.netty-netty-codec-haproxy-4.1.100.Final.jar
+    - io.netty-netty-common-4.1.100.Final.jar
+    - io.netty-netty-handler-4.1.100.Final.jar
+    - io.netty-netty-handler-proxy-4.1.100.Final.jar
+    - io.netty-netty-resolver-4.1.100.Final.jar
+    - io.netty-netty-resolver-dns-4.1.100.Final.jar
+    - io.netty-netty-transport-4.1.100.Final.jar
+    - io.netty-netty-transport-classes-epoll-4.1.100.Final.jar
+    - io.netty-netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
+    - io.netty-netty-transport-native-epoll-4.1.100.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.100.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.100.Final-linux-x86_64.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar

diff --git a/pom.xml b/pom.xml
@@ -110,7 +110,7 @@ flexible messaging model and an intuitive client API.</description>
     <snappy.version>1.1.10.5</snappy.version> <!-- ZooKeeper server -->
     <dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!-- ZooKeeper server -->
     <curator.version>5.1.0</curator.version>
-    <netty.version>4.1.93.Final</netty.version>
+    <netty.version>4.1.100.Final</netty.version>
     <jetty.version>9.4.51.v20230217</jetty.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <jersey.version>2.34</jersey.version>

diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
@@ -232,31 +232,31 @@ The Apache Software License, Version 2.0
     - commons-lang3-3.11.jar
  * Netty
      - netty-3.10.6.Final.jar
-    - netty-buffer-4.1.93.Final.jar
-    - netty-codec-4.1.93.Final.jar
-    - netty-codec-dns-4.1.93.Final.jar
-    - netty-codec-http-4.1.93.Final.jar
-    - netty-codec-haproxy-4.1.93.Final.jar
-    - netty-codec-socks-4.1.93.Final.jar
-    - netty-handler-proxy-4.1.93.Final.jar
-    - netty-common-4.1.93.Final.jar
-    - netty-handler-4.1.93.Final.jar
+    - netty-buffer-4.1.100.Final.jar
+    - netty-codec-4.1.100.Final.jar
+    - netty-codec-dns-4.1.100.Final.jar
+    - netty-codec-http-4.1.100.Final.jar
+    - netty-codec-haproxy-4.1.100.Final.jar
+    - netty-codec-socks-4.1.100.Final.jar
+    - netty-handler-proxy-4.1.100.Final.jar
+    - netty-common-4.1.100.Final.jar
+    - netty-handler-4.1.100.Final.jar
     - netty-reactive-streams-2.0.6.jar
-    - netty-resolver-4.1.93.Final.jar
-    - netty-resolver-dns-4.1.93.Final.jar
+    - netty-resolver-4.1.100.Final.jar
+    - netty-resolver-dns-4.1.100.Final.jar
     - netty-tcnative-boringssl-static-2.0.61.Final.jar
     - netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar
     - netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar
     - netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar
     - netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar
     - netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar
     - netty-tcnative-classes-2.0.61.Final.jar
-    - netty-transport-4.1.93.Final.jar
-    - netty-transport-classes-epoll-4.1.93.Final.jar
-    - netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.93.Final.jar
-    - netty-transport-native-unix-common-4.1.93.Final-linux-x86_64.jar
-    - netty-codec-http2-4.1.93.Final.jar
+    - netty-transport-4.1.100.Final.jar
+    - netty-transport-classes-epoll-4.1.100.Final.jar
+    - netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
+    - netty-transport-native-unix-common-4.1.100.Final.jar
+    - netty-transport-native-unix-common-4.1.100.Final-linux-x86_64.jar
+    - netty-codec-http2-4.1.100.Final.jar
  * GRPC
     - grpc-api-1.55.3.jar
     - grpc-context-1.55.3.jar