π The fast, Pythonic way to build MCP servers and clients.
fix: validate server names in install commands (#3522)
Jeremiah Lowinb2d4cc90e5b7
diff --git a/src/fastmcp/cli/install/claude_code.py b/src/fastmcp/cli/install/claude_code.pyindex a88413a32..5aa377568 100644--- a/src/fastmcp/cli/install/claude_code.py+++ b/src/fastmcp/cli/install/claude_code.py@@ -12,7 +12,7 @@ from rich import printfrom fastmcp.utilities.logging import get_loggerfrom fastmcp.utilities.mcp_server_config.v1.environments.uv import UVEnvironment-from .shared import process_common_args+from .shared import process_common_args, validate_server_namelogger = get_logger(__name__)@@ -124,6 +124,8 @@ def install_claude_code(# Build the full commandfull_command = env_config.build_command(["fastmcp", "run", server_spec])+ validate_server_name(name)+# Build claude mcp add commandcmd_parts = [claude_cmd, "mcp", "add", name]diff --git a/src/fastmcp/cli/install/gemini_cli.py b/src/fastmcp/cli/install/gemini_cli.pyindex 42b6ec778..29cc39e15 100644--- a/src/fastmcp/cli/install/gemini_cli.py+++ b/src/fastmcp/cli/install/gemini_cli.py@@ -12,7 +12,7 @@ from rich import printfrom fastmcp.utilities.logging import get_loggerfrom fastmcp.utilities.mcp_server_config.v1.environments.uv import UVEnvironment-from .shared import process_common_args+from .shared import process_common_args, validate_server_namelogger = get_logger(__name__)@@ -129,6 +129,8 @@ def install_gemini_cli(for key, value in env_vars.items():cmd_parts.extend(["-e", f"{key}={value}"])+ validate_server_name(name)+# Add server name and commandcmd_parts.extend([name, full_command[0], "--"])cmd_parts.extend(full_command[1:])diff --git a/src/fastmcp/cli/install/shared.py b/src/fastmcp/cli/install/shared.pyindex fe980dce6..df22f5bbf 100644--- a/src/fastmcp/cli/install/shared.py+++ b/src/fastmcp/cli/install/shared.py@@ -2,6 +2,7 @@import jsonimport os+import reimport subprocessimport sysfrom pathlib import Path@@ -17,6 +18,26 @@ from fastmcp.utilities.mcp_server_config.v1.sources.filesystem import FileSystemlogger = get_logger(__name__)+# Server names are passed as subprocess arguments to CLI tools like `claude`+# and `gemini`. On Windows these may resolve to .cmd/.bat wrappers that run+# through cmd.exe, where shell metacharacters (& | ; etc.) in arguments can+# cause command injection. Restrict names to safe characters.+_SAFE_NAME_RE = re.compile(r"^[\w\-. ]+$")+++def validate_server_name(name: str) -> str:+ """Validate that a server name is safe for use as a subprocess argument.++ Raises SystemExit if the name contains shell metacharacters.+ """+ if not _SAFE_NAME_RE.match(name):+ print(+ f"[red]Invalid server name '[bold]{name}[/bold]': "+ "names may only contain letters, numbers, hyphens, underscores, dots, and spaces.[/red]"+ )+ sys.exit(1)+ return name+def parse_env_var(env_var: str) -> tuple[str, str]:"""Parse environment variable string in format KEY=VALUE."""diff --git a/tests/cli/test_install.py b/tests/cli/test_install.pyindex 6b354c9b7..9dca455fa 100644--- a/tests/cli/test_install.py+++ b/tests/cli/test_install.py@@ -1,6 +1,9 @@from pathlib import Path+import pytest+from fastmcp.cli.install import install_app+from fastmcp.cli.install.shared import validate_server_namefrom fastmcp.cli.install.stdio import install_stdio@@ -455,3 +458,37 @@ class TestInstallCommandParsing:command, bound, _ = install_app.parse_args(cmd_args)assert command is not Noneassert str(bound.arguments["project"]) == str(Path("/path/to/project"))+++class TestServerNameValidation:+ """Test server name validation rejects shell metacharacters."""++ @pytest.mark.parametrize(+ "name",+ [+ "my-server",+ "my_server",+ "My Server",+ "server.v2",+ "test123",+ ],+ )+ def test_valid_names(self, name: str):+ assert validate_server_name(name) == name++ @pytest.mark.parametrize(+ "name",+ [+ "test&calc",+ "test|whoami",+ "test;ls",+ "test$(id)",+ "test`id`",+ 'test"quoted',+ "test>file",+ "test<file",+ ],+ )+ def test_rejects_shell_metacharacters(self, name: str):+ with pytest.raises(SystemExit):+ validate_server_name(name)