fix(mcp): expand JVM system properties in stdio args/env/cwd

This commit is contained in:
matevip 2026-05-05 15:21:20 +08:00
parent fd05c3c9e1
commit 0665a6be09

View File

@ -269,6 +269,7 @@ public class McpClientManager {
// Args // Args
if (server.getArgsJson() != null && !server.getArgsJson().isBlank()) { if (server.getArgsJson() != null && !server.getArgsJson().isBlank()) {
List<String> args = JSONUtil.toList(server.getArgsJson(), String.class); List<String> args = JSONUtil.toList(server.getArgsJson(), String.class);
args = args.stream().map(McpClientManager::expandEnvVars).toList();
builder.args(args); builder.args(args);
} }
@ -376,17 +377,22 @@ public class McpClientManager {
} }
/** /**
* 展开环境变量引用 ${ENV_VAR} $ENV_VAR * 展开系统属性和环境变量引用 ${user.home}${ENV_VAR} $ENV_VAR
* <p> * <p>
* 先处理 ${VAR}精确匹配再用正则处理 $VARword boundary * 先处理 ${VAR}精确匹配JVM 系统属性优先于环境变量
* 避免 $PATH 误替换 $PATH_HOME 的问题 * 这样 ${user.home} 等跨平台占位符在 Windows 上也能解析
* 再用正则处理 $VARword boundary避免 $PATH 误替换 $PATH_HOME 的问题
*/ */
private static String expandEnvVars(String value) { private static String expandEnvVars(String value) {
if (value == null || !value.contains("$")) { if (value == null || !value.contains("$")) {
return value; return value;
} }
String result = value; String result = value;
// Phase 1: 精确匹配 ${VAR} 模式不会误替换 // Phase 1a: ${VAR} 优先匹配 JVM system property ${user.home}${java.io.tmpdir}
for (String key : System.getProperties().stringPropertyNames()) {
result = result.replace("${" + key + "}", System.getProperty(key));
}
// Phase 1b: ${VAR} 回退匹配 OS 环境变量
for (Map.Entry<String, String> env : System.getenv().entrySet()) { for (Map.Entry<String, String> env : System.getenv().entrySet()) {
result = result.replace("${" + env.getKey() + "}", env.getValue()); result = result.replace("${" + env.getKey() + "}", env.getValue());
} }