fix 'addCustomHeaders' header value replace bug (#6257)

Co-authored-by: aias00 <[email protected]>
Co-authored-by: loongs-zhang <[email protected]>

Author: 3 people

shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/callback/ShenyuToolCallback.java

@@ -346,7 +346,7 @@ private RequestConfig buildRequestConfig(final String configStr, final JsonObjec
         // Build body with parameter formatting (only format body parameters that need it)
         final JsonObject bodyJson = buildFormattedBodyJson(argsToJsonBody, argsPosition, inputJson);
 
-        return new RequestConfig(method, path, bodyJson, requestTemplate, argsToJsonBody);
+        return new RequestConfig(method, path, bodyJson, requestTemplate, argsToJsonBody, inputJson);
     }
 
     /**
@@ -470,10 +470,20 @@ private void addCustomHeaders(final ServerHttpRequest.Builder requestBuilder,
         if (requestConfig.getRequestTemplate().has("headers")) {
             for (final var headerElem : requestConfig.getRequestTemplate().getAsJsonArray("headers")) {
                 final JsonObject headerObj = headerElem.getAsJsonObject();
-                requestBuilder.header(
-                        headerObj.get("key").getAsString(),
-                        headerObj.get("value").getAsString()
-                );
+                String headerKey = headerObj.get("key").getAsString();
+                String headerValue = headerObj.get("value").getAsString();
+                if (headerValue.contains("{{.")) {
+                    JsonObject inputJson = requestConfig.getInputJson();
+                    if (Objects.nonNull(inputJson)) {
+                        for (String key : inputJson.keySet()) {
+                            if (inputJson.get(key).isJsonPrimitive() && inputJson.get(key).getAsJsonPrimitive().isString()) {
+                                String value = inputJson.get(key).getAsString();
+                                headerValue = headerValue.replace("{{." + key + "}}", value);
+                            }
+                        }
+                    }
+                }
+                requestBuilder.header(headerKey, headerValue);
             }
         }
     }

shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/request/RequestConfig.java

@@ -30,13 +30,16 @@ public class RequestConfig {
     private JsonObject requestTemplate;
 
     private boolean argsToJsonBody;
+
+    private JsonObject inputJson;
 
-    public RequestConfig(final String method, final String path, final JsonObject bodyJson, final JsonObject requestTemplate, final boolean argsToJsonBody) {
+    public RequestConfig(final String method, final String path, final JsonObject bodyJson, final JsonObject requestTemplate, final boolean argsToJsonBody, final JsonObject inputJson) {
         this.method = method;
         this.path = path;
         this.bodyJson = bodyJson;
         this.requestTemplate = requestTemplate;
         this.argsToJsonBody = argsToJsonBody;
+        this.inputJson = inputJson;
     }
 
     public String getMethod() {
@@ -78,4 +81,12 @@ public boolean isArgsToJsonBody() {
     public void setArgsToJsonBody(final boolean argsToJsonBody) {
         this.argsToJsonBody = argsToJsonBody;
     }
+
+    public JsonObject getInputJson() {
+        return inputJson;
+    }
+
+    public void setInputJson(final JsonObject inputJson) {
+        this.inputJson = inputJson;
+    }
 }