remote-cmd-manager 1.2.2__tar.gz → 1.2.3__tar.gz

{remote_cmd_manager-1.2.2/remote_cmd_manager.egg-info → remote_cmd_manager-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remote_cmd_manager
-Version: 1.2.2
+Version: 1.2.3
 Summary: SSH 远程服务器管理工具 / Python SSH remote server management tool
 Author-email: Vae-Scrooge <vaescrooge@gmail.com>
 License: MIT

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remote_cmd_manager"
-version = "1.2.2"
+version = "1.2.3"
 description = "SSH 远程服务器管理工具 / Python SSH remote server management tool"
 readme = "README.md"
 requires-python = ">=3.9"

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/remote_cmd/__init__.py

@@ -48,11 +48,11 @@ Remote CMD - SSH 远程服务器管理工具
     - 文档: 参见 docs/ 目录
 
 Author: Vae-Scrooge
-Version: 1.2.2
+Version: 1.2.3
 License: MIT
 """
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 __author__ = "Vae-Scrooge"
 __email__ = "vae-scrooge@example.com"
 __license__ = "MIT"

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/remote_cmd/cli/main.py

@@ -34,6 +34,7 @@ from remote_cmd.service.credential_provider import (
 from remote_cmd.service.host_service import HostService
 from remote_cmd.service.storage_factory import build_repository
 from remote_cmd.utils.config import get_default_config_path, load_config
+from remote_cmd.utils.crypto import CredentialEncryption
 
 
 def _build_service(config_file: str, storage_backend: Optional[str] = None) -> HostService:
@@ -49,7 +50,11 @@ def _build_service(config_file: str, storage_backend: Optional[str] = None) -> H
     explicitly, otherwise inferred from the config file extension:
     .json -> JsonHostRepository; .db/.sqlite -> SqliteHostRepository.
     """
-    repo = build_repository(filepath=config_file, storage_backend=storage_backend)
+    repo = build_repository(
+        filepath=config_file,
+        storage_backend=storage_backend,
+        encryption=CredentialEncryption(),
+    )
     cred_provider = ChainCredentialProvider(
         [
             EnvCredentialProvider(),

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/remote_cmd/service/credential_provider.py

@@ -65,7 +65,13 @@ class EnvCredentialProvider(CredentialProvider):
 
     @staticmethod
     def _host_env_suffix(host_name: str) -> str:
-        """将主机名转换为环境变量后缀：web1 -> WEB1，my-host -> MY_HOST"""
+        """
+        将主机名转换为环境变量后缀：web1 -> WEB1，my-host -> MY_HOST
+
+        注意: 非字母数字字符统一归一化为下划线，因此 ``web-1`` 与 ``web_1``
+        会映射到同一个变量 ``..._WEB_1``。若同舰队同时存在这两种命名，
+        需避免依赖同名变量（如需区分请先统一主机命名规范）。
+        """
         normalized = "".join(c if c.isalnum() else "_" for c in host_name).upper()
         return normalized
 

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/remote_cmd/service/storage_factory.py

@@ -13,6 +13,7 @@
     >>> repo = build_repository("hosts.json")
     >>> repo = build_repository("hosts.db")
     >>> repo = build_repository("hosts.json", storage_backend="sqlite")
+    >>> repo = build_repository("hosts.db", encryption=CredentialEncryption())
 """
 
 from pathlib import Path
@@ -21,19 +22,24 @@ from typing import Callable, Optional
 from remote_cmd.repository.host_repository import HostRepository
 from remote_cmd.repository.json_host_repository import JsonHostRepository
 from remote_cmd.repository.sqlite_host_repository import SqliteHostRepository
+from remote_cmd.utils.crypto import CredentialEncryption
 
 # 显式 storage_backend 取值 -> 仓库工厂
-BACKEND_FACTORIES: dict[str, Callable[[str], HostRepository]] = {
-    "json": lambda path: JsonHostRepository(filepath=path, auto_load=True),
-    "sqlite": lambda path: SqliteHostRepository(db_path=path),
-    "sqlite3": lambda path: SqliteHostRepository(db_path=path),
+BACKEND_FACTORIES: dict[str, Callable[[str, Optional[CredentialEncryption]], HostRepository]] = {
+    "json": lambda path, encryption: JsonHostRepository(
+        filepath=path, auto_load=True, encryption=encryption
+    ),
+    "sqlite": lambda path, encryption: SqliteHostRepository(db_path=path, encryption=encryption),
+    "sqlite3": lambda path, encryption: SqliteHostRepository(db_path=path, encryption=encryption),
 }
 
 # 扩展名 -> 仓库工厂
-EXTENSION_FACTORIES: dict[str, Callable[[str], HostRepository]] = {
-    ".json": lambda path: JsonHostRepository(filepath=path, auto_load=True),
-    ".db": lambda path: SqliteHostRepository(db_path=path),
-    ".sqlite": lambda path: SqliteHostRepository(db_path=path),
+EXTENSION_FACTORIES: dict[str, Callable[[str, Optional[CredentialEncryption]], HostRepository]] = {
+    ".json": lambda path, encryption: JsonHostRepository(
+        filepath=path, auto_load=True, encryption=encryption
+    ),
+    ".db": lambda path, encryption: SqliteHostRepository(db_path=path, encryption=encryption),
+    ".sqlite": lambda path, encryption: SqliteHostRepository(db_path=path, encryption=encryption),
 }
 
 
@@ -76,6 +82,7 @@ def resolve_storage_backend(filepath: str, storage_backend: Optional[str] = None
 def build_repository(
     filepath: str,
     storage_backend: Optional[str] = None,
+    encryption: Optional[CredentialEncryption] = None,
 ) -> HostRepository:
     """
     根据扩展名或显式存储后端构建 HostRepository。
@@ -83,6 +90,9 @@ def build_repository(
     Args:
         filepath: hosts 文件路径
         storage_backend: 显式指定的存储后端（可选，优先于扩展名推断）
+        encryption: 凭据加密器（可选）。传入后仓库在写入时自动加密密码、
+            读取时自动解密，作为防御深度（即使调用方绕过 HostService
+            直接 save() 明文密码，落盘仍是密文）。
 
     Returns:
         HostRepository: 匹配的仓库实例
@@ -92,4 +102,4 @@ def build_repository(
     """
     backend = resolve_storage_backend(filepath, storage_backend)
     factory = BACKEND_FACTORIES[backend]
-    return factory(filepath)
+    return factory(filepath, encryption)

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3/remote_cmd_manager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remote_cmd_manager
-Version: 1.2.2
+Version: 1.2.3
 Summary: SSH 远程服务器管理工具 / Python SSH remote server management tool
 Author-email: Vae-Scrooge <vaescrooge@gmail.com>
 License: MIT

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/integration/conftest.py

@@ -32,7 +32,9 @@ class MockSSHServerInterface(paramiko.ServerInterface):
         return "password,publickey"
 
     def check_channel_exec_request(
-        self, channel: paramiko.Channel, command: bytes  # noqa: ARG002
+        self,
+        channel: paramiko.Channel,  # noqa: ARG002
+        command: bytes,  # noqa: ARG002
     ) -> bool:
         return True
 

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/integration/test_ssh_connection.py

@@ -29,9 +29,7 @@ class TestSSHConnectionIntegration:
 
     def test_connect_with_password(self, mock_ssh_server, integration_host):
         """密码认证连接成功"""
-        config = ConnectionConfig(
-            port=integration_host.port, **self.TEST_CONFIG
-        )
+        config = ConnectionConfig(port=integration_host.port, **self.TEST_CONFIG)
         client = SSHClient(config)
         client.connect()
         assert client.is_connected()
@@ -39,9 +37,7 @@ class TestSSHConnectionIntegration:
 
     def test_connect_and_disconnect(self, mock_ssh_server, integration_host):
         """连接后断开"""
-        config = ConnectionConfig(
-            port=integration_host.port, **self.TEST_CONFIG
-        )
+        config = ConnectionConfig(port=integration_host.port, **self.TEST_CONFIG)
         client = SSHClient(config)
         client.connect()
         assert client.is_connected()
@@ -73,18 +69,14 @@ class TestSSHConnectionIntegration:
 
     def test_context_manager(self, mock_ssh_server, integration_host):
         """上下文管理器自动关闭连接"""
-        config = ConnectionConfig(
-            port=integration_host.port, **self.TEST_CONFIG
-        )
+        config = ConnectionConfig(port=integration_host.port, **self.TEST_CONFIG)
         with SSHClient(config) as client:
             assert client.is_connected()
         assert not client.is_connected()
 
     def test_double_disconnect_safe(self, mock_ssh_server, integration_host):
         """重复 disconnect 不抛异常"""
-        config = ConnectionConfig(
-            port=integration_host.port, **self.TEST_CONFIG
-        )
+        config = ConnectionConfig(port=integration_host.port, **self.TEST_CONFIG)
         client = SSHClient(config)
         client.connect()
         client.disconnect()

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/performance/conftest.py

@@ -84,9 +84,7 @@ def patched_async_client():
             await asyncio.sleep(state["latency"])
             return CommandResult(command=command, stdout="OK", stderr="", exit_code=0)
 
-    with patch(
-        "remote_cmd.service.async_batch_executor.AsyncSSHClient", _StubClient
-    ):
+    with patch("remote_cmd.service.async_batch_executor.AsyncSSHClient", _StubClient):
         yield state
 
 

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/performance/test_benchmarks.py

@@ -116,9 +116,7 @@ class TestSchedulingOverhead:
 
         # --- 异步路径 ---
         hosts2 = make_hosts(n)
-        ex_async, _ = async_backend_factory(
-            hosts2, max_concurrency=concurrency, latency=latency
-        )
+        ex_async, _ = async_backend_factory(hosts2, max_concurrency=concurrency, latency=latency)
         t0 = time.perf_counter()
         asyncio.run(ex_async.execute([h.name for h in hosts2], "uptime"))
         async_wall = time.perf_counter() - t0
@@ -130,8 +128,7 @@ class TestSchedulingOverhead:
         )
         # 断言：异步不应慢于同步（框架开销更小）。允许 10% 测量波动。
         assert async_wall <= sync_wall * 1.1, (
-            f"异步 {async_wall:.4f}s 慢于同步 {sync_wall:.4f}s，"
-            f"speedup={speedup:.2f}x"
+            f"异步 {async_wall:.4f}s 慢于同步 {sync_wall:.4f}s，speedup={speedup:.2f}x"
         )
 
 
@@ -143,9 +140,7 @@ class TestSchedulingOverhead:
 class TestScalabilityCurve:
     """不同规模下记录耗时，输出可扩展性曲线与并发倍率。"""
 
-    @pytest.mark.parametrize(
-        "n, concurrency", [(10, 10), (50, 10), (100, 20), (500, 50)]
-    )
+    @pytest.mark.parametrize("n, concurrency", [(10, 10), (50, 10), (100, 20), (500, 50)])
     def test_scalability_async(self, async_backend_factory, n, concurrency):
         latency = 0.02
         hosts = make_hosts(n)
@@ -166,9 +161,7 @@ class TestScalabilityCurve:
         # 可扩展性断言：实测不应超过理论 1.5 倍
         assert wall < ideal * 1.5
 
-    @pytest.mark.parametrize(
-        "n, concurrency", [(10, 10), (50, 10), (100, 20), (500, 50)]
-    )
+    @pytest.mark.parametrize("n, concurrency", [(10, 10), (50, 10), (100, 20), (500, 50)])
     def test_scalability_sync(self, sync_backend_factory, n, concurrency):
         latency = 0.02
         hosts = make_hosts(n)
@@ -228,9 +221,7 @@ class TestUseAsyncDelegation:
 
         from remote_cmd.service.batch_executor import BatchExecutor
 
-        with patch(
-            "remote_cmd.service.async_batch_executor.AsyncSSHClient", _Stub
-        ):
+        with patch("remote_cmd.service.async_batch_executor.AsyncSSHClient", _Stub):
             ex_delegated = BatchExecutor(
                 host_service=make_mock_service(hosts),
                 max_concurrency=10,

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/test_async_batch_executor.py

@@ -247,9 +247,7 @@ class TestAsyncConnectionPool:
     async def test_monitor_loop_handles_exception(self, config, patched_client):
         """测试：监控循环中异常被捕获并继续运行"""
         pool = AsyncConnectionPool(config=config, health_check_interval=0.01)
-        pool._cleanup_expired = AsyncMock(
-            side_effect=[RuntimeError("boom"), None, None, None]
-        )
+        pool._cleanup_expired = AsyncMock(side_effect=[RuntimeError("boom"), None, None, None])
         pool._start_monitor()
         await asyncio.sleep(0.05)
         pool.stop_monitor()
@@ -259,6 +257,7 @@ class TestAsyncConnectionPool:
     @pytest.mark.asyncio
     async def test_create_connection_failure(self, config):
         """测试：创建连接失败时释放信号量并累计失败数"""
+
         def failing_factory(cfg):
             client = _client_mock()
             client.connect = AsyncMock(side_effect=OSError("auth failed"))
@@ -266,10 +265,13 @@ class TestAsyncConnectionPool:
 
         pool = AsyncConnectionPool(config=config, max_connections=1)
         try:
-            with patch(
-                "remote_cmd.core.async_connection_pool.AsyncSSHClient",
-                side_effect=failing_factory,
-            ), pytest.raises(OSError):
+            with (
+                patch(
+                    "remote_cmd.core.async_connection_pool.AsyncSSHClient",
+                    side_effect=failing_factory,
+                ),
+                pytest.raises(OSError),
+            ):
                 await pool.acquire()
             assert pool.get_metrics()["failed"] == 1
         finally:
@@ -299,9 +301,7 @@ class TestAsyncConnectionPool:
     @pytest.mark.asyncio
     async def test_monitor_loop_cancelled(self, config, patched_client):
         """测试：监控任务可被取消"""
-        pool = AsyncConnectionPool(
-            config=config, health_check_interval=0.01
-        )
+        pool = AsyncConnectionPool(config=config, health_check_interval=0.01)
         pool._start_monitor()
         assert pool._monitor_task is not None
         await asyncio.sleep(0.05)
@@ -322,9 +322,7 @@ class TestAsyncConnectionPool:
     @pytest.mark.asyncio
     async def test_cleanup_expired(self, config, patched_client):
         """测试：清理过期与空闲超时连接"""
-        pool = AsyncConnectionPool(
-            config=config, max_connections=3, max_lifetime=1, idle_timeout=1
-        )
+        pool = AsyncConnectionPool(config=config, max_connections=3, max_lifetime=1, idle_timeout=1)
         try:
             c1 = await pool.acquire()
             c2 = await pool.acquire()

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/test_async_ssh_client.py

@@ -104,9 +104,7 @@ class TestAsyncSSHClientConnect:
 
     @pytest.mark.asyncio
     async def test_connect_timeout(self, config, patched_asyncssh):
-        patched_asyncssh.connect = AsyncMock(
-            side_effect=OSError("Connection timed out")
-        )
+        patched_asyncssh.connect = AsyncMock(side_effect=OSError("Connection timed out"))
         client = AsyncSSHClient(config)
         with pytest.raises(SSHConnectionError, match="connection timeout"):
             await client.connect()
@@ -156,9 +154,7 @@ class TestAsyncSSHClientExecute:
 
     @pytest.mark.asyncio
     async def test_execute_failure_exit_code(self, config, patched_asyncssh, conn_mock):
-        conn_mock.run = AsyncMock(
-            return_value=MagicMock(stdout="", stderr="boom", exit_status=127)
-        )
+        conn_mock.run = AsyncMock(return_value=MagicMock(stdout="", stderr="boom", exit_status=127))
         async with AsyncSSHClient(config) as client:
             r = await client.execute("badcmd")
         assert r.success is False
@@ -167,9 +163,7 @@ class TestAsyncSSHClientExecute:
 
     @pytest.mark.asyncio
     async def test_execute_sudo_without_password(self, config, patched_asyncssh, conn_mock):
-        conn_mock.run = AsyncMock(
-            return_value=MagicMock(stdout="ok", stderr="", exit_status=0)
-        )
+        conn_mock.run = AsyncMock(return_value=MagicMock(stdout="ok", stderr="", exit_status=0))
         async with AsyncSSHClient(config) as client:
             r = await client.execute_sudo("whoami")
         assert r.success

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/test_batch_executor.py

@@ -282,9 +282,7 @@ class TestBatchExecutor:
         future_map = {}
 
         # 调用 _handle_interrupt
-        executor._handle_interrupt(
-            future_map, ["srv1", "srv2", "srv3"], "uptime", existing_results
-        )
+        executor._handle_interrupt(future_map, ["srv1", "srv2", "srv3"], "uptime", existing_results)
 
         # 验证：srv1 保留原结果，srv2/srv3 被标记为 user interrupted
         assert existing_results["srv1"].success is True
@@ -390,6 +388,7 @@ class TestBatchExecutor:
             pass
 
         import logging
+
         with caplog.at_level(logging.WARNING, logger="remote_cmd.service.batch_executor"):
             executor = BatchExecutor(host_service=service)
             executor.execute(["srv1"], "uptime", progress_callback=async_callback)

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/test_ssh_client.py

@@ -256,13 +256,19 @@ class TestSSHClientExecute:
     def test_execute_ssh_exception(self, mock_paramiko):
         mock_paramiko.exec_command.side_effect = paramiko.SSHException("channel error")
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as client, pytest.raises(SSHCommandError, match="command execution failed"):
+        with (
+            SSHClient(config) as client,
+            pytest.raises(SSHCommandError, match="command execution failed"),
+        ):
             client.execute("ls")
 
     def test_execute_os_error(self, mock_paramiko):
         mock_paramiko.exec_command.side_effect = OSError("pipe broken")
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as client, pytest.raises(SSHCommandError, match="command execution failed"):
+        with (
+            SSHClient(config) as client,
+            pytest.raises(SSHCommandError, match="command execution failed"),
+        ):
             client.execute("ls")
 
     def test_execute_stdout_decoding(self, mock_paramiko):
@@ -323,8 +329,9 @@ class TestSSHClientFileTransfer:
 
     def test_upload_missing_local(self, mock_paramiko):  # noqa: ARG002
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as client, pytest.raises(
-            SSHFileTransferError, match="Local file not found"
+        with (
+            SSHClient(config) as client,
+            pytest.raises(SSHFileTransferError, match="Local file not found"),
         ):
             client.upload_file("/no/file", "/remote/x")
 
@@ -334,8 +341,9 @@ class TestSSHClientFileTransfer:
         sftp = mock_paramiko.open_sftp.return_value
         sftp.put.side_effect = paramiko.SSHException("transfer fail")
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as client, pytest.raises(
-            SSHFileTransferError, match="file upload failed"
+        with (
+            SSHClient(config) as client,
+            pytest.raises(SSHFileTransferError, match="file upload failed"),
         ):
             client.upload_file(str(local), "/remote/x")
 
@@ -352,8 +360,9 @@ class TestSSHClientFileTransfer:
         sftp = mock_paramiko.open_sftp.return_value
         sftp.get.side_effect = OSError("disk full")
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as client, pytest.raises(
-            SSHFileTransferError, match="file download failed"
+        with (
+            SSHClient(config) as client,
+            pytest.raises(SSHFileTransferError, match="file download failed"),
         ):
             client.download_file("/remote/x", str(tmp_path / "x.txt"))
 
@@ -377,8 +386,9 @@ class TestSSHClientFileTransfer:
         sftp = mock_paramiko.open_sftp.return_value
         sftp.listdir_attr.side_effect = paramiko.SSHException("ls fail")
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as client, pytest.raises(
-            SSHFileTransferError, match="failed to list remote directory"
+        with (
+            SSHClient(config) as client,
+            pytest.raises(SSHFileTransferError, match="failed to list remote directory"),
         ):
             client.list_remote_directory("/")
 
@@ -400,8 +410,9 @@ class TestSSHClientFileTransfer:
         sftp = mock_paramiko.open_sftp.return_value
         sftp.remove.side_effect = paramiko.SSHException("rm fail")
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as client, pytest.raises(
-            SSHFileTransferError, match="failed to delete remote file"
+        with (
+            SSHClient(config) as client,
+            pytest.raises(SSHFileTransferError, match="failed to delete remote file"),
         ):
             client.remove_remote_file("/remote/x.txt")
 
@@ -457,8 +468,9 @@ class TestSSHClientFileTransfer:
         sftp = mock_paramiko.open_sftp.return_value
         sftp.stat.side_effect = paramiko.SSHException("stat fail")
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as client, pytest.raises(
-            SSHFileTransferError, match="failed to get file info"
+        with (
+            SSHClient(config) as client,
+            pytest.raises(SSHFileTransferError, match="failed to get file info"),
         ):
             client.get_remote_file_info("/remote/x.txt")
 
@@ -501,8 +513,9 @@ class TestSSHClientFileTransfer:
         sftp.stat.side_effect = OSError("not found")
         sftp.mkdir.side_effect = paramiko.SSHException("mkdir fail")
         config = ConnectionConfig(hostname="h", username="u")
-        with SSHClient(config) as c, pytest.raises(
-            SSHFileTransferError, match="failed to create remote directory"
+        with (
+            SSHClient(config) as c,
+            pytest.raises(SSHFileTransferError, match="failed to create remote directory"),
         ):
             c.create_remote_directory("/a/b")
 

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/test_storage_factory.py

@@ -7,6 +7,9 @@
 - 未知扩展名且无显式配置时抛出 ValueError
 """
 
+import json
+import sqlite3
+
 import pytest
 
 from remote_cmd.repository.json_host_repository import JsonHostRepository
@@ -80,3 +83,48 @@ class TestBuildRepository:
         """默认 hosts.json 行为保持为 JSON 存储，不破坏兼容性"""
         repo = build_repository(str(tmp_path / "hosts.json"))
         assert isinstance(repo, JsonHostRepository)
+
+    def test_encryption_wired_into_json_repo(self, tmp_path):
+        """测试：传入 encryption 后 JSON 仓库在写入时加密密码"""
+        from remote_cmd.core.host import Host
+        from remote_cmd.utils.crypto import CredentialEncryption
+
+        path = str(tmp_path / "hosts.json")
+        repo = build_repository(path, encryption=CredentialEncryption())
+        repo.save(Host(name="srv1", hostname="10.0.0.1", username="admin", password="secret"))
+        repo.flush()
+
+        with open(path, encoding="utf-8") as f:
+            raw = json.load(f)
+        stored = raw["hosts"]["srv1"]["password"]
+        assert stored != "secret"
+        assert stored.startswith("$encrypted$") or "encrypted" in stored
+
+    def test_encryption_wired_into_sqlite_repo(self, tmp_path):
+        """测试：传入 encryption 后 SQLite 仓库在写入时加密密码"""
+        from remote_cmd.core.host import Host
+        from remote_cmd.utils.crypto import CredentialEncryption
+
+        path = str(tmp_path / "hosts.db")
+        repo = build_repository(path, encryption=CredentialEncryption())
+        repo.save(Host(name="srv1", hostname="10.0.0.1", username="admin", password="secret"))
+
+        conn = sqlite3.connect(path)
+        try:
+            row = conn.execute("SELECT password FROM hosts WHERE name = ?", ("srv1",)).fetchone()
+            assert row[0] != "secret"
+        finally:
+            conn.close()
+
+    def test_without_encryption_preserves_old_behavior(self, tmp_path):
+        """测试：不传 encryption 时保持原有行为（明文直存，兼容）"""
+        from remote_cmd.core.host import Host
+
+        path = str(tmp_path / "hosts.json")
+        repo = build_repository(path)
+        repo.save(Host(name="srv1", hostname="10.0.0.1", username="admin", password="secret"))
+        repo.flush()
+
+        with open(path, encoding="utf-8") as f:
+            raw = json.load(f)
+        assert raw["hosts"]["srv1"]["password"] == "secret"

{remote_cmd_manager-1.2.2 → remote_cmd_manager-1.2.3}/tests/test_sync_connection_pool.py

@@ -261,9 +261,7 @@ class TestSyncConnectionPool:
         # 强行使 conn 空闲超时
         pool._meta[id(conn)]["last_used"] = time.time() - 1000
 
-        conn.execute.return_value = CommandResult(
-            command="true", stdout="", stderr="", exit_code=0
-        )
+        conn.execute.return_value = CommandResult(command="true", stdout="", stderr="", exit_code=0)
         conn2 = pool.acquire()
         assert conn2 is conn  # 探活成功，复用
         pool.close_all()