cli-mcp-server 0.1.2__py3-none-any.whl → 0.2.1__py3-none-any.whl

cli_mcp_server/__init__.py

@@ -9,4 +9,4 @@ def main():
 
 
 # Optionally expose other important items at package level
-__all__ = ['main', 'server']
+__all__ = ["main", "server"]

cli_mcp_server/server.py

@@ -13,10 +13,26 @@ from mcp.server.models import InitializationOptions
 server = Server("cli-mcp-server")
 
 
-class CommandSecurityError(Exception):
-    """
-    Custom exception for command security violations
-    """
+class CommandError(Exception):
+    """Base exception for command-related errors"""
+
+    pass
+
+
+class CommandSecurityError(CommandError):
+    """Security violation errors"""
+
+    pass
+
+
+class CommandExecutionError(CommandError):
+    """Command execution errors"""
+
+    pass
+
+
+class CommandTimeoutError(CommandError):
+    """Command timeout errors"""
 
     pass
 
@@ -29,9 +45,10 @@ class SecurityConfig:
 
     allowed_commands: set[str]
     allowed_flags: set[str]
-    allowed_patterns: List[str]
     max_command_length: int
     command_timeout: int
+    allow_all_commands: bool = False
+    allow_all_flags: bool = False
 
 
 class CommandExecutor:
@@ -41,6 +58,27 @@ class CommandExecutor:
         self.allowed_dir = os.path.abspath(os.path.realpath(allowed_dir))
         self.security_config = security_config
 
+    def _normalize_path(self, path: str) -> str:
+        """
+        Normalizes a path and ensures it's within allowed directory.
+        """
+        try:
+            if os.path.isabs(path):
+                # If absolute path, check directly
+                real_path = os.path.abspath(os.path.realpath(path))
+            else:
+                # If relative path, combine with allowed_dir first
+                real_path = os.path.abspath(os.path.realpath(os.path.join(self.allowed_dir, path)))
+
+            if not self._is_path_safe(real_path):
+                raise CommandSecurityError(f"Path '{path}' is outside of allowed directory: {self.allowed_dir}")
+
+            return real_path
+        except CommandSecurityError:
+            raise
+        except Exception as e:
+            raise CommandSecurityError(f"Invalid path '{path}': {str(e)}")
+
     def validate_command(self, command_string: str) -> tuple[str, List[str]]:
         """
         Validates and parses a command string for security and formatting.
@@ -64,10 +102,7 @@ class CommandExecutor:
         shell_operators = ["&&", "||", "|", ">", ">>", "<", "<<", ";"]
         for operator in shell_operators:
             if operator in command_string:
-                raise CommandSecurityError(
-                    f"Shell operator '{operator}' is not supported. "
-                    "Only single commands are allowed."
-                )
+                raise CommandSecurityError(f"Shell operator '{operator}' is not supported")
 
         try:
             parts = shlex.split(command_string)
@@ -76,33 +111,29 @@ class CommandExecutor:
 
             command, args = parts[0], parts[1:]
 
-            # Validate command
-            if command not in self.security_config.allowed_commands:
+            # Validate command if not in allow-all mode
+            if not self.security_config.allow_all_commands and command not in self.security_config.allowed_commands:
                 raise CommandSecurityError(f"Command '{command}' is not allowed")
 
-            # Validate arguments
+            # Process and validate arguments
+            validated_args = []
             for arg in args:
                 if arg.startswith("-"):
-                    if arg not in self.security_config.allowed_flags:
+                    if not self.security_config.allow_all_flags and arg not in self.security_config.allowed_flags:
                         raise CommandSecurityError(f"Flag '{arg}' is not allowed")
+                    validated_args.append(arg)
                     continue
 
-                # Validate path if argument looks like a path
-                if "/" in arg or "\\" in arg or os.path.isabs(arg):
-                    full_path = os.path.abspath(os.path.join(self.allowed_dir, arg))
-                    if not self._is_path_safe(full_path):
-                        raise CommandSecurityError(f"Path '{arg}' is not allowed")
-
-                # Check patterns
-                if not any(
-                        re.match(pattern, arg)
-                        for pattern in self.security_config.allowed_patterns
-                ):
-                    raise CommandSecurityError(
-                        f"Argument '{arg}' doesn't match allowed patterns"
-                    )
-
-            return command, args
+                # For any path-like argument, validate it
+                if "/" in arg or "\\" in arg or os.path.isabs(arg) or arg == ".":
+                    normalized_path = self._normalize_path(arg)
+                    validated_args.append(normalized_path)
+                else:
+                    # For non-path arguments, add them as-is
+                    validated_args.append(arg)
+
+            return command, validated_args
+
         except ValueError as e:
             raise CommandSecurityError(f"Invalid command format: {str(e)}")
 
@@ -123,8 +154,12 @@ class CommandExecutor:
         Private method intended for internal use only.
         """
         try:
-            abs_path = os.path.abspath(os.path.realpath(path))
-            return abs_path.startswith(self.allowed_dir)
+            # Resolve any symlinks and get absolute path
+            real_path = os.path.abspath(os.path.realpath(path))
+            allowed_dir_real = os.path.abspath(os.path.realpath(self.allowed_dir))
+
+            # Check if the path starts with allowed_dir
+            return real_path.startswith(allowed_dir_real)
         except Exception:
             return False
 
@@ -155,11 +190,11 @@ class CommandExecutor:
             - Captures both stdout and stderr
         """
         if len(command_string) > self.security_config.max_command_length:
-            raise CommandSecurityError("Command string too long")
+            raise CommandSecurityError(f"Command exceeds maximum length of {self.security_config.max_command_length}")
 
         try:
-
             command, args = self.validate_command(command_string)
+
             return subprocess.run(
                 [command] + args,
                 shell=False,
@@ -168,10 +203,12 @@ class CommandExecutor:
                 timeout=self.security_config.command_timeout,
                 cwd=self.allowed_dir,
             )
+        except subprocess.TimeoutExpired:
+            raise CommandTimeoutError(f"Command timed out after {self.security_config.command_timeout} seconds")
+        except CommandError:
+            raise
         except Exception as e:
-            if isinstance(e, CommandSecurityError):
-                raise
-            raise CommandSecurityError(f"Command execution failed: {str(e)}")
+            raise CommandExecutionError(f"Command execution failed: {str(e)}")
 
 
 # Load security configuration from environment
@@ -187,43 +224,48 @@ def load_security_config() -> SecurityConfig:
         SecurityConfig: Configuration object containing:
             - allowed_commands: Set of permitted command names
             - allowed_flags: Set of permitted command flags/options
-            - allowed_patterns: List of regex patterns for valid inputs
             - max_command_length: Maximum length of command string
             - command_timeout: Maximum execution time in seconds
+            - allow_all_commands: Whether all commands are allowed
+            - allow_all_flags: Whether all flags are allowed
 
     Environment Variables:
-        ALLOWED_COMMANDS: Comma-separated list of allowed commands (default: "ls,cat,pwd")
-        ALLOWED_FLAGS: Comma-separated list of allowed flags (default: "-l,-a,--help")
-        ALLOWED_PATTERNS: Comma-separated list of patterns (default: "*.txt,*.log,*.md")
+        ALLOWED_COMMANDS: Comma-separated list of allowed commands or 'all' (default: "ls,cat,pwd")
+        ALLOWED_FLAGS: Comma-separated list of allowed flags or 'all' (default: "-l,-a,--help")
         MAX_COMMAND_LENGTH: Maximum command string length (default: 1024)
         COMMAND_TIMEOUT: Command timeout in seconds (default: 30)
     """
+    allowed_commands = os.getenv("ALLOWED_COMMANDS", "ls,cat,pwd")
+    allowed_flags = os.getenv("ALLOWED_FLAGS", "-l,-a,--help")
+    
+    allow_all_commands = allowed_commands.lower() == 'all'
+    allow_all_flags = allowed_flags.lower() == 'all'
+    
     return SecurityConfig(
-        allowed_commands=set(os.getenv("ALLOWED_COMMANDS", "ls,cat,pwd").split(",")),
-        allowed_flags=set(os.getenv("ALLOWED_FLAGS", "-l,-a,--help").split(",")),
-        allowed_patterns=[
-            r"^[\w\-. ]+$",  # Basic filename pattern
-            *os.getenv("ALLOWED_PATTERNS", "*.txt,*.log,*.md").split(","),
-        ],
+        allowed_commands=set() if allow_all_commands else set(allowed_commands.split(",")),
+        allowed_flags=set() if allow_all_flags else set(allowed_flags.split(",")),
         max_command_length=int(os.getenv("MAX_COMMAND_LENGTH", "1024")),
         command_timeout=int(os.getenv("COMMAND_TIMEOUT", "30")),
+        allow_all_commands=allow_all_commands,
+        allow_all_flags=allow_all_flags,
     )
 
 
-executor = CommandExecutor(
-    allowed_dir=os.getenv("ALLOWED_DIR", ""), security_config=load_security_config()
-)
+executor = CommandExecutor(allowed_dir=os.getenv("ALLOWED_DIR", ""), security_config=load_security_config())
 
 
 @server.list_tools()
 async def handle_list_tools() -> list[types.Tool]:
+    commands_desc = "all commands" if executor.security_config.allow_all_commands else ", ".join(executor.security_config.allowed_commands)
+    flags_desc = "all flags" if executor.security_config.allow_all_flags else ", ".join(executor.security_config.allowed_flags)
+    
     return [
         types.Tool(
             name="run_command",
             description=(
                 f"Allows command (CLI) execution in the directory: {executor.allowed_dir}\n\n"
-                f"Available commands: {', '.join(executor.security_config.allowed_commands)}\n"
-                f"Available flags: {', '.join(executor.security_config.allowed_flags)}\n\n"
+                f"Available commands: {commands_desc}\n"
+                f"Available flags: {flags_desc}\n\n"
                 "Note: Shell operators (&&, |, >, >>) are not supported."
             ),
             inputSchema={
@@ -231,7 +273,7 @@ async def handle_list_tools() -> list[types.Tool]:
                 "properties": {
                     "command": {
                         "type": "string",
-                        "description": "Single command to execute (example: 'ls -l' or 'cat file.txt')"
+                        "description": "Single command to execute (example: 'ls -l' or 'cat file.txt')",
                     }
                 },
                 "required": ["command"],
@@ -239,26 +281,20 @@ async def handle_list_tools() -> list[types.Tool]:
         ),
         types.Tool(
             name="show_security_rules",
-            description=(
-                "Show what commands and operations are allowed in this environment.\n"
-            ),
+            description=("Show what commands and operations are allowed in this environment.\n"),
             inputSchema={
                 "type": "object",
                 "properties": {},
             },
-        )
+        ),
     ]
 
 
 @server.call_tool()
-async def handle_call_tool(
-        name: str, arguments: Optional[Dict[str, Any]]
-) -> List[types.TextContent]:
+async def handle_call_tool(name: str, arguments: Optional[Dict[str, Any]]) -> List[types.TextContent]:
     if name == "run_command":
         if not arguments or "command" not in arguments:
-            return [
-                types.TextContent(type="text", text="No command provided", error=True)
-            ]
+            return [types.TextContent(type="text", text="No command provided", error=True)]
 
         try:
             result = executor.execute(arguments["command"])
@@ -267,9 +303,7 @@ async def handle_call_tool(
             if result.stdout:
                 response.append(types.TextContent(type="text", text=result.stdout))
             if result.stderr:
-                response.append(
-                    types.TextContent(type="text", text=result.stderr, error=True)
-                )
+                response.append(types.TextContent(type="text", text=result.stderr, error=True))
 
             response.append(
                 types.TextContent(
@@ -281,11 +315,7 @@ async def handle_call_tool(
             return response
 
         except CommandSecurityError as e:
-            return [
-                types.TextContent(
-                    type="text", text=f"Security violation: {str(e)}", error=True
-                )
-            ]
+            return [types.TextContent(type="text", text=f"Security violation: {str(e)}", error=True)]
         except subprocess.TimeoutExpired:
             return [
                 types.TextContent(
@@ -298,19 +328,19 @@ async def handle_call_tool(
             return [types.TextContent(type="text", text=f"Error: {str(e)}", error=True)]
 
     elif name == "show_security_rules":
+        commands_desc = "All commands allowed" if executor.security_config.allow_all_commands else ", ".join(sorted(executor.security_config.allowed_commands))
+        flags_desc = "All flags allowed" if executor.security_config.allow_all_flags else ", ".join(sorted(executor.security_config.allowed_flags))
+        
         security_info = (
             "Security Configuration:\n"
             f"==================\n"
             f"Working Directory: {executor.allowed_dir}\n"
             f"\nAllowed Commands:\n"
             f"----------------\n"
-            f"{', '.join(sorted(executor.security_config.allowed_commands))}\n"
+            f"{commands_desc}\n"
             f"\nAllowed Flags:\n"
             f"-------------\n"
-            f"{', '.join(sorted(executor.security_config.allowed_flags))}\n"
-            f"\nAllowed Patterns:\n"
-            f"----------------\n"
-            f"{', '.join(executor.security_config.allowed_patterns)}\n"
+            f"{flags_desc}\n"
             f"\nSecurity Limits:\n"
             f"---------------\n"
             f"Max Command Length: {executor.security_config.max_command_length} characters\n"
@@ -328,10 +358,10 @@ async def main():
             write_stream,
             InitializationOptions(
                 server_name="cli-mcp-server",
-                server_version="0.1.1",
+                server_version="0.2.1",
                 capabilities=server.get_capabilities(
                     notification_options=NotificationOptions(),
                     experimental_capabilities={},
                 ),
             ),
-        )
+        )

{cli_mcp_server-0.1.2.dist-info → cli_mcp_server-0.2.1.dist-info}/METADATA

@@ -1,14 +1,15 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: cli-mcp-server
-Version: 0.1.2
+Version: 0.2.1
 Summary: Command line interface for MCP clients with secure execution and customizable security policies
 Project-URL: Homepage, https://github.com/MladenSU/cli-mcp-server
 Project-URL: Documentation, https://github.com/MladenSU/cli-mcp-server#readme
 Project-URL: Repository, https://github.com/MladenSU/cli-mcp-server.git
 Project-URL: Bug Tracker, https://github.com/MladenSU/cli-mcp-server/issues
 Author-email: Mladen <fangs-lever6n@icloud.com>
+License-File: LICENSE
 Requires-Python: >=3.10
-Requires-Dist: mcp>=1.0.0
+Requires-Dist: mcp>=1.1.0
 Description-Content-Type: text/markdown
 
 # CLI MCP Server
@@ -22,6 +23,9 @@ features.
 ![License](https://img.shields.io/badge/license-MIT-blue.svg)
 ![Python Version](https://img.shields.io/badge/python-3.10%2B-blue)
 ![MCP Protocol](https://img.shields.io/badge/MCP-Compatible-green)
+[![smithery badge](https://smithery.ai/badge/cli-mcp-server)](https://smithery.ai/protocol/cli-mcp-server)
+
+<a href="https://glama.ai/mcp/servers/q89277vzl1"><img width="380" height="200" src="https://glama.ai/mcp/servers/q89277vzl1/badge" /></a>
 
 ---
 
@@ -71,10 +75,17 @@ Configure the server using environment variables:
 | `ALLOWED_DIR`        | Base directory for command execution     | Required           |
 | `ALLOWED_COMMANDS`   | Comma-separated list of allowed commands | `ls,cat,pwd`       |
 | `ALLOWED_FLAGS`      | Comma-separated list of allowed flags    | `-l,-a,--help`     |
-| `ALLOWED_PATTERNS`   | Comma-separated file patterns            | `*.txt,*.log,*.md` |
 | `MAX_COMMAND_LENGTH` | Maximum command string length            | `1024`             |
 | `COMMAND_TIMEOUT`    | Command execution timeout (seconds)      | `30`               |
 
+## Installation
+
+To install CLI MCP Server for Claude Desktop automatically via [Smithery](https://smithery.ai/protocol/cli-mcp-server):
+
+```bash
+npx @smithery/cli install cli-mcp-server --client claude
+```
+
 ## Available Tools
 
 ### run_command
@@ -117,7 +128,6 @@ Add to your `~/Library/Application\ Support/Claude/claude_desktop_config.json`:
         "ALLOWED_DIR": "</your/desired/dir>",
         "ALLOWED_COMMANDS": "ls,cat,pwd,echo",
         "ALLOWED_FLAGS": "-l,-a,--help,--version",
-        "ALLOWED_PATTERNS": "*.txt,*.log,*.md",
         "MAX_COMMAND_LENGTH": "1024",
         "COMMAND_TIMEOUT": "30"
       }
@@ -140,7 +150,6 @@ Add to your `~/Library/Application\ Support/Claude/claude_desktop_config.json`:
         "ALLOWED_DIR": "</your/desired/dir>",
         "ALLOWED_COMMANDS": "ls,cat,pwd,echo",
         "ALLOWED_FLAGS": "-l,-a,--help,--version",
-        "ALLOWED_PATTERNS": "*.txt,*.log,*.md",
         "MAX_COMMAND_LENGTH": "1024",
         "COMMAND_TIMEOUT": "30"
       }
@@ -148,6 +157,7 @@ Add to your `~/Library/Application\ Support/Claude/claude_desktop_config.json`:
   }
 }
 ```
+> In case it's not working or showing in the UI, clear your cache via `uv clean`.
 
 ## Security Features
 
@@ -208,7 +218,7 @@ You can launch the MCP Inspector via [`npm`](https://docs.npmjs.com/downloading-
 this command:
 
 ```bash
-npx @modelcontextprotocol/inspector uv --directory {{your source code local directory}}/unichat-mcp-server run unichat-mcp-server
+npx @modelcontextprotocol/inspector uv --directory {{your source code local directory}}/cli-mcp-server run cli-mcp-server
 ```
 
 Upon launching, the Inspector will display a URL that you can access in your browser to begin debugging.
@@ -219,4 +229,4 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
  ---
 
-For more information or support, please open an issue on the project repository.
+For more information or support, please open an issue on the project repository.

cli_mcp_server-0.2.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+cli_mcp_server/__init__.py,sha256=bGLiX7XuhVsS-PJdoRIWXiilZ3NTAQ7fb9_8kkNzLlM,216
+cli_mcp_server/server.py,sha256=N2BtE8YLf8P643GPwawnnmf1kg7blY6Z0x2KP9zYhS8,13918
+cli_mcp_server-0.2.1.dist-info/METADATA,sha256=rWoOhhU4jK0Yt8BAguG1_k9v3y5q9SiJbw6PWfKl75M,6566
+cli_mcp_server-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cli_mcp_server-0.2.1.dist-info/entry_points.txt,sha256=07bDmJJSXg-6VCFEFTOlsGoxI-0faJafT1yEEjUdN-U,55
+cli_mcp_server-0.2.1.dist-info/licenses/LICENSE,sha256=85rOR_IMpb2VzXBA4VCRZh_KWlaO1Rly8HDYDwGgMWk,1062
+cli_mcp_server-0.2.1.dist-info/RECORD,,

{cli_mcp_server-0.1.2.dist-info → cli_mcp_server-0.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

cli_mcp_server-0.1.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-cli_mcp_server/__init__.py,sha256=F95EXGXtBnIVQqu-bXcasy5OfORA-gzLnvXyqWFtjcY,216
-cli_mcp_server/server.py,sha256=vXfPFCIbPjZ8J6cyRinCMZgFYBev5muwmPkq4ZFAh3s,12336
-cli_mcp_server-0.1.2.dist-info/METADATA,sha256=daSaUn_7-fGogH5fHN9VOPWETW1x2hO7pauuZ59x5eI,6199
-cli_mcp_server-0.1.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-cli_mcp_server-0.1.2.dist-info/entry_points.txt,sha256=07bDmJJSXg-6VCFEFTOlsGoxI-0faJafT1yEEjUdN-U,55
-cli_mcp_server-0.1.2.dist-info/licenses/LICENSE,sha256=85rOR_IMpb2VzXBA4VCRZh_KWlaO1Rly8HDYDwGgMWk,1062
-cli_mcp_server-0.1.2.dist-info/RECORD,,