From eb0e4ee92b9aea3ed93abb3f21dd0dfdb0893003 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Wed, 27 Aug 2025 09:12:44 -0700
Subject: [PATCH 1/3] Change GeneralScriptException to 400

Errors in scripts are generally due to user errors in the script itself.
ScriptException has a 400 status code reflecting that fact, but
GeneralScriptException uses the default 500 status code. This commit
fixes GeneralScriptException to match the 400 status code of other
scripting errors.
---
 .../org/elasticsearch/script/GeneralScriptException.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/main/java/org/elasticsearch/script/GeneralScriptException.java b/server/src/main/java/org/elasticsearch/script/GeneralScriptException.java
index 2c620af10eee3..61cbe20705aed 100644
--- a/server/src/main/java/org/elasticsearch/script/GeneralScriptException.java
+++ b/server/src/main/java/org/elasticsearch/script/GeneralScriptException.java
@@ -11,6 +11,7 @@
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.rest.RestStatus;
 
 import java.io.IOException;
 
@@ -38,4 +39,8 @@ public GeneralScriptException(String msg, Throwable cause) {
     public GeneralScriptException(StreamInput in) throws IOException {
         super(in);
     }
+
+    public RestStatus status() {
+        return RestStatus.BAD_REQUEST;
+    }
 }

From 398aee912ffb68c14e07b23412e71fe54eb3c38e Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Wed, 27 Aug 2025 09:16:26 -0700
Subject: [PATCH 2/3] Update docs/changelog/133659.yaml

---
 docs/changelog/133659.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/changelog/133659.yaml

diff --git a/docs/changelog/133659.yaml b/docs/changelog/133659.yaml
new file mode 100644
index 0000000000000..78c6de09d8516
--- /dev/null
+++ b/docs/changelog/133659.yaml
@@ -0,0 +1,5 @@
+pr: 133659
+summary: Change `GeneralScriptException` to 400
+area: Infra/Scripting
+type: bug
+issues: []

From 29a572a195be94f25c46e229e5db3a41ae66961b Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Wed, 27 Aug 2025 09:20:33 -0700
Subject: [PATCH 3/3] improve changelog

---
 docs/changelog/133659.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog/133659.yaml b/docs/changelog/133659.yaml
index 78c6de09d8516..8cbec2c637499 100644
--- a/docs/changelog/133659.yaml
+++ b/docs/changelog/133659.yaml
@@ -1,5 +1,5 @@
 pr: 133659
-summary: Change `GeneralScriptException` to 400
+summary: Fixed GeneralScriptException to return 400 http status code
 area: Infra/Scripting
 type: bug
 issues: []