[Backport 3.2] Bump netty from 4.1.121.Final to 4.1.124.Final (opensearch-project#19107)

opensearch-trigger-bot[bot] · github-actions[bot] · cwperks · mch2 · commit 6848c469ed86 · 2025-09-26T12:07:19.000-07:00
* Bump netty from 4.1.121.Final to 4.1.124.Final (opensearch-project#19103) * Bump netty from 4.1.121.Final to 4.1.124.Final Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add CHANGELOG entry Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit b77770c) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Update CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig Perkins <cwperx@amazon.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -115,6 +115,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 ### Dependencies
+- Bump netty from 4.1.121.Final to 4.1.124.Final ([#19103](https://github.com/opensearch-project/OpenSearch/pull/19103))
 
 ### Deprecated
 
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+1e9c299dc908e801b4e041bef1b81cfe0ca0038c
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+081e66a1586b6ae4f810f297d2b050c968a11658
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+57d4a06c3241f153410ffec292004fbba87b9695
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+24f9b9afacb3d79c176d10424890ebd4457ceaf7
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+46f22130821ee796e347b90693f61d7fc4b2e8a6
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+13abbd2534e08e60b42829900d2a5d10b9417129
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+85758b8fd2e75bce01423298592401bf649a5e31
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+ce4f80c96f32d51659e142237c3ffbc678765e4e
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+06df613f0356d4de02574507754afb33874a7336
diff --git a/mustache.patch b/mustache.patch
@@ -0,0 +1,68 @@
+diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java
+index 842353fdba3..3d6dca775b7 100644
+--- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java
++++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java
+@@ -47,13 +47,16 @@ import org.opensearch.script.ScriptEngine;
+ import org.opensearch.script.ScriptException;
+ import org.opensearch.script.TemplateScript;
+ 
++import java.io.IOException;
+ import java.io.Reader;
+ import java.io.StringReader;
+ import java.io.StringWriter;
++import java.io.Writer;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import java.util.Collections;
+ import java.util.Map;
++import java.util.Objects;
+ import java.util.Set;
+ 
+ /**
+@@ -110,6 +113,37 @@ public final class MustacheScriptEngine implements ScriptEngine {
+         return NAME;
+     }
+ 
++    private final class BoundedWriter extends Writer {
++        private final Writer delegate;
++        private final long maxChars;
++        private long written;
++
++        public BoundedWriter(Writer delegate, long maxChars) {
++            this.delegate = Objects.requireNonNull(delegate);
++            this.maxChars = maxChars;
++        }
++
++        @Override
++        public void write(char[] cbuf, int off, int len) throws IOException {
++            if (written + len > maxChars) {
++                throw new IOException("Writer size limit " + maxChars + " chars exceeded");
++            }
++            delegate.write(cbuf, off, len);
++            written += len;
++        }
++
++        /* delegate flush()/close() as-is */
++        @Override
++        public void flush() throws IOException {
++            delegate.flush();
++        }
++
++        @Override
++        public void close() throws IOException {
++            delegate.close();
++        }
++    }
++
+     /**
+      * Used at query execution time by script service in order to execute a query template.
+      * */
+@@ -131,7 +165,7 @@ public final class MustacheScriptEngine implements ScriptEngine {
+         @SuppressWarnings("removal")
+         @Override
+         public String execute() {
+-            final StringWriter writer = new StringWriter();
++            final Writer writer = new BoundedWriter(new StringWriter(), 100_000); // 100 k chars max
+             try {
+                 // crazy reflection here
+                 SpecialPermission.check();
diff --git a/plugins/arrow-flight-rpc/licenses/netty-buffer-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-buffer-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+1e9c299dc908e801b4e041bef1b81cfe0ca0038c
diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+081e66a1586b6ae4f810f297d2b050c968a11658
diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-http-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-http-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+57d4a06c3241f153410ffec292004fbba87b9695
diff --git a/plugins/arrow-flight-rpc/licenses/netty-codec-http2-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-codec-http2-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+24f9b9afacb3d79c176d10424890ebd4457ceaf7
diff --git a/plugins/arrow-flight-rpc/licenses/netty-common-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+46f22130821ee796e347b90693f61d7fc4b2e8a6
diff --git a/plugins/arrow-flight-rpc/licenses/netty-handler-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-handler-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+13abbd2534e08e60b42829900d2a5d10b9417129
diff --git a/plugins/arrow-flight-rpc/licenses/netty-resolver-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-resolver-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+85758b8fd2e75bce01423298592401bf649a5e31
diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+ce4f80c96f32d51659e142237c3ffbc678765e4e
diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-classes-epoll-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-classes-epoll-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+c211ad4e253d8fbb195a868d849c2645544866e7
diff --git a/plugins/arrow-flight-rpc/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1 b/plugins/arrow-flight-rpc/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+06df613f0356d4de02574507754afb33874a7336
diff --git a/plugins/ingestion-kinesis/licenses/netty-buffer-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-buffer-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+1e9c299dc908e801b4e041bef1b81cfe0ca0038c
diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+081e66a1586b6ae4f810f297d2b050c968a11658
diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-http-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-http-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+57d4a06c3241f153410ffec292004fbba87b9695
diff --git a/plugins/ingestion-kinesis/licenses/netty-codec-http2-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-codec-http2-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+24f9b9afacb3d79c176d10424890ebd4457ceaf7
diff --git a/plugins/ingestion-kinesis/licenses/netty-common-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+46f22130821ee796e347b90693f61d7fc4b2e8a6
diff --git a/plugins/ingestion-kinesis/licenses/netty-handler-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-handler-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+13abbd2534e08e60b42829900d2a5d10b9417129
diff --git a/plugins/ingestion-kinesis/licenses/netty-resolver-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-resolver-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+85758b8fd2e75bce01423298592401bf649a5e31
diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+ce4f80c96f32d51659e142237c3ffbc678765e4e
diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-classes-epoll-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-classes-epoll-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+c211ad4e253d8fbb195a868d849c2645544866e7
diff --git a/plugins/ingestion-kinesis/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1 b/plugins/ingestion-kinesis/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+06df613f0356d4de02574507754afb33874a7336
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.124.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+ecfc4946066df549ecce8b9cec999e4b1526c8f2
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.124.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+24f9b9afacb3d79c176d10424890ebd4457ceaf7
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.124.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+fc2ee1c4e0d88804c1d058da8b3a4d483b1a2754
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.124.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+ae6a6cee393435f59634f2f96fa88f671dac90e0
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.124.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+e8a87f24b00128b931ee18cac08a3be745dc84ce
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+06df613f0356d4de02574507754afb33874a7336
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.124.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+69da28615a03bf0a3e377fdb44106338d57c52d9
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+1e9c299dc908e801b4e041bef1b81cfe0ca0038c
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+081e66a1586b6ae4f810f297d2b050c968a11658
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+57d4a06c3241f153410ffec292004fbba87b9695
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+24f9b9afacb3d79c176d10424890ebd4457ceaf7
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+46f22130821ee796e347b90693f61d7fc4b2e8a6
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+13abbd2534e08e60b42829900d2a5d10b9417129
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+85758b8fd2e75bce01423298592401bf649a5e31
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+ce4f80c96f32d51659e142237c3ffbc678765e4e
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+c211ad4e253d8fbb195a868d849c2645544866e7
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+06df613f0356d4de02574507754afb33874a7336
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+1e9c299dc908e801b4e041bef1b81cfe0ca0038c
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+081e66a1586b6ae4f810f297d2b050c968a11658
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+ecfc4946066df549ecce8b9cec999e4b1526c8f2
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+57d4a06c3241f153410ffec292004fbba87b9695
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+24f9b9afacb3d79c176d10424890ebd4457ceaf7
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+46f22130821ee796e347b90693f61d7fc4b2e8a6
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+13abbd2534e08e60b42829900d2a5d10b9417129
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+85758b8fd2e75bce01423298592401bf649a5e31
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+e8a87f24b00128b931ee18cac08a3be745dc84ce
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+ce4f80c96f32d51659e142237c3ffbc678765e4e
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.124.Final.jar.sha1
@@ -0,0 +1 @@
+06df613f0356d4de02574507754afb33874a7336

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1e9c299dc908e801b4e041bef1b81cfe0ca0038c`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+081e66a1586b6ae4f810f297d2b050c968a11658`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+57d4a06c3241f153410ffec292004fbba87b9695`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+24f9b9afacb3d79c176d10424890ebd4457ceaf7`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+46f22130821ee796e347b90693f61d7fc4b2e8a6`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+13abbd2534e08e60b42829900d2a5d10b9417129`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+85758b8fd2e75bce01423298592401bf649a5e31`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ce4f80c96f32d51659e142237c3ffbc678765e4e`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+06df613f0356d4de02574507754afb33874a7336`