ssh-licco 2.1.1__tar.gz → 2.1.3__tar.gz

{ssh_licco-2.1.1/ssh_licco.egg-info → ssh_licco-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssh-licco
-Version: 2.1.1
+Version: 2.1.3
 Summary: SSH Model Context Protocol Server - Enable SSH functionality for AI models
 Author-email: SSH LICCO Team <contact@ssh-licco.dev>
 License: MIT
@@ -575,7 +575,7 @@ ssh-licco 的核心依赖是：
 
 | 指标 | 状态 |
 |------|------|
-| **测试用例** | 344 passed, 0 skipped |
+| **测试用例** | 348 passed, 0 skipped |
 | **覆盖率** | 16 个源模块全覆盖 |
 | **测试框架** | pytest + pytest-asyncio |
 

{ssh_licco-2.1.1 → ssh_licco-2.1.3}/README.md

@@ -542,7 +542,7 @@ ssh-licco 的核心依赖是：
 
 | 指标 | 状态 |
 |------|------|
-| **测试用例** | 344 passed, 0 skipped |
+| **测试用例** | 348 passed, 0 skipped |
 | **覆盖率** | 16 个源模块全覆盖 |
 | **测试框架** | pytest + pytest-asyncio |
 

{ssh_licco-2.1.1 → ssh_licco-2.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ssh-licco"
-version = "2.1.1"
+version = "2.1.3"
 description = "SSH Model Context Protocol Server - Enable SSH functionality for AI models"
 readme = "README.md"
 requires-python = ">=3.10"

{ssh_licco-2.1.1 → ssh_licco-2.1.3/ssh_licco.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssh-licco
-Version: 2.1.1
+Version: 2.1.3
 Summary: SSH Model Context Protocol Server - Enable SSH functionality for AI models
 Author-email: SSH LICCO Team <contact@ssh-licco.dev>
 License: MIT
@@ -575,7 +575,7 @@ ssh-licco 的核心依赖是：
 
 | 指标 | 状态 |
 |------|------|
-| **测试用例** | 344 passed, 0 skipped |
+| **测试用例** | 348 passed, 0 skipped |
 | **覆盖率** | 16 个源模块全覆盖 |
 | **测试框架** | pytest + pytest-asyncio |
 

{ssh_licco-2.1.1 → ssh_licco-2.1.3}/ssh_licco.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ ssh_mcp/__main__.py
 ssh_mcp/approval.py
 ssh_mcp/audit_logger.py
 ssh_mcp/batch_executor.py
+ssh_mcp/cli.py
 ssh_mcp/config_manager.py
 ssh_mcp/connection_config.py
 ssh_mcp/connection_pool.py

{ssh_licco-2.1.1 → ssh_licco-2.1.3}/ssh_mcp/__init__.py

@@ -1,8 +1,8 @@
 # SSH-LICCO 版本信息
 # 所有代码中的版本信息都从这里读取
-# 版本号：2.1.1
+# 版本号：2.1.3
 
-__version__ = "2.1.1"
+__version__ = "2.1.3"
 __author__ = "Li Qi"
 __email__ = "1985694657@qq.com"
 __license__ = "MIT"

ssh_licco-2.1.3/ssh_mcp/cli.py

@@ -0,0 +1,135 @@
+"""SSH-LICCO command line interface."""
+from __future__ import annotations
+
+import argparse
+import os
+import sys
+from pathlib import Path
+
+from ssh_mcp import __version__
+
+
+def _build_parser() -> argparse.ArgumentParser:
+    """Build the CLI argument parser."""
+    parser = argparse.ArgumentParser(
+        prog="ssh-licco",
+        description="SSH-LICCO: Remote server management via MCP and CLI.",
+    )
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=f"ssh-licco {__version__}",
+    )
+
+    subparsers = parser.add_subparsers(dest="subcommand", required=False)
+
+    # exec
+    exec_parser = subparsers.add_parser("exec", help="Execute a remote command")
+    exec_parser.add_argument("cmd", help="Command to execute")
+    exec_parser.add_argument("--host", default=None, help="Remote host")
+    exec_parser.add_argument("-u", "--username", default=None, help="SSH username")
+    exec_parser.add_argument("--password", default=None, help="SSH password")
+    exec_parser.add_argument(
+        "--connect-timeout", type=int, default=None, help="Connection timeout in seconds"
+    )
+
+    # upload
+    upload_parser = subparsers.add_parser("upload", help="Upload a file")
+    upload_parser.add_argument("local", help="Local file path")
+    upload_parser.add_argument("remote", help="Remote file path")
+    upload_parser.add_argument("--host", default=None, help="Remote host")
+    upload_parser.add_argument("-u", "--username", default=None, help="SSH username")
+    upload_parser.add_argument("--password", default=None, help="SSH password")
+
+    # download
+    download_parser = subparsers.add_parser("download", help="Download a file")
+    download_parser.add_argument("remote", help="Remote file path")
+    download_parser.add_argument("local", help="Local file path")
+    download_parser.add_argument("--host", default=None, help="Remote host")
+    download_parser.add_argument("-u", "--username", default=None, help="SSH username")
+    download_parser.add_argument("--password", default=None, help="SSH password")
+
+    # docker-build
+    docker_build_parser = subparsers.add_parser("docker-build", help="Build a Docker image")
+    docker_build_parser.add_argument("image", help="Image tag")
+    docker_build_parser.add_argument("-c", "--context", default=".", help="Build context")
+    docker_build_parser.add_argument("-f", "--dockerfile", default="Dockerfile", help="Dockerfile path")
+    docker_build_parser.add_argument("-t", "--timeout", type=int, default=600, help="Build timeout")
+
+    # serve
+    subparsers.add_parser("serve", help="Start the MCP server")
+
+    # list-hosts
+    subparsers.add_parser("list-hosts", help="List configured hosts")
+
+    return parser
+
+
+def _load_connection_config(args: argparse.Namespace) -> dict:
+    """Load connection config from CLI args or environment variables."""
+    host = args.host or os.getenv("SSH_HOST")
+    username = args.username or os.getenv("SSH_USER")
+    password = args.password or os.getenv("SSH_PASSWORD")
+    port = args.port if getattr(args, "port", None) else 22
+    timeout = args.connect_timeout if getattr(args, "connect_timeout", None) else 30
+
+    return {
+        "host": host,
+        "port": port,
+        "username": username,
+        "password": password,
+        "timeout": timeout,
+    }
+
+
+def main(argv: list[str] | None = None) -> int:
+    """CLI entry point."""
+    parser = _build_parser()
+    args = parser.parse_args(argv)
+
+    if args.subcommand is None:
+        parser.print_help()
+        return 0
+
+    if args.subcommand == "serve":
+        from ssh_mcp.server import run_server
+
+        run_server()
+        return 0
+
+    if args.subcommand == "list-hosts":
+        from ssh_mcp.config_manager import ConfigManager
+
+        manager = ConfigManager()
+        hosts = manager.list_hosts()
+        if not hosts:
+            print("No hosts configured.")
+            return 0
+        for name, config in hosts.items():
+            print(f"{name}: {config.host}:{config.port} ({config.username})")
+        return 0
+
+    if args.subcommand == "exec":
+        config = _load_connection_config(args)
+        print(f"Would execute on {config['host']}: {args.cmd}")
+        return 0
+
+    if args.subcommand == "upload":
+        config = _load_connection_config(args)
+        print(f"Would upload {args.local} -> {config['host']}:{args.remote}")
+        return 0
+
+    if args.subcommand == "download":
+        config = _load_connection_config(args)
+        print(f"Would download {config['host']}:{args.remote} -> {args.local}")
+        return 0
+
+    if args.subcommand == "docker-build":
+        print(f"Would build Docker image {args.image} from {args.context}/{args.dockerfile}")
+        return 0
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{ssh_licco-2.1.1 → ssh_licco-2.1.3}/ssh_mcp/handlers/file_transfer.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import re
 import shlex
+from pathlib import PurePosixPath
 
 from mcp.types import TextContent
 
@@ -12,6 +13,58 @@ from .context import HandlerContext
 from .utils import ensure_session
 
 
+# 远程敏感路径黑名单：禁止通过文件传输操作访问或删除
+FORBIDDEN_REMOTE_PATHS = [
+    "/etc",
+    "/root",
+    "/boot",
+    "/proc",
+    "/sys",
+    "/dev",
+    "/bin",
+    "/sbin",
+    "/usr/bin",
+    "/usr/sbin",
+    "/lib",
+    "/lib64",
+    "/var/lib/postgresql",
+    "/var/lib/mysql",
+    "/var/lib/redis",
+    "/var/lib/docker",
+    "/var/log",
+    "/var/spool",
+    "/var/mail",
+    "/home/*/.ssh",
+]
+
+
+def _validate_remote_path(remote_path: str, operation: str = "access") -> tuple[bool, str]:
+    """校验远程路径是否安全。
+
+    Returns:
+        (is_safe, error_message)
+    """
+    if not remote_path or not remote_path.strip():
+        return False, "远程路径不能为空"
+
+    # 路径遍历检查
+    normalized = str(PurePosixPath(remote_path)).rstrip("/") or "/"
+    if ".." in normalized.split("/"):
+        return False, f"路径遍历被阻止：{remote_path}"
+
+    # 检查是否命中敏感路径黑名单
+    path_for_check = normalized.rstrip("/*") or "/"
+    for forbidden in FORBIDDEN_REMOTE_PATHS:
+        if forbidden.endswith("/*"):
+            prefix = forbidden[:-1]
+            if path_for_check.startswith(prefix) or path_for_check + "/" == prefix:
+                return False, f"禁止{operation}敏感路径：{forbidden}"
+        elif path_for_check == forbidden or path_for_check.startswith(forbidden + "/"):
+            return False, f"禁止{operation}敏感路径：{forbidden}"
+
+    return True, ""
+
+
 async def handle_file_transfer(ctx: HandlerContext, args: dict) -> list[TextContent]:
     """Transfer files between local and remote, or perform remote file operations."""
     session_id = await ensure_session(ctx, args, handle_connect)
@@ -51,6 +104,9 @@ async def handle_file_transfer(ctx: HandlerContext, args: dict) -> list[TextCont
     elif direction == "delete":
         if not remote_path:
             return [TextContent(type="text", text="delete requires remote_path")]
+        safe, err = _validate_remote_path(remote_path, operation="delete")
+        if not safe:
+            return [TextContent(type="text", text=f"❌ Delete blocked: {err}")]
         result = await session.delete_file(remote_path)
     elif direction == "mkdir":
         if not remote_path: