sycommon-python-lib 0.2.7a17__py3-none-any.whl → 0.2.7a19__py3-none-any.whl

sycommon/agent/middleware/sandbox_path_guard.py

@@ -44,8 +44,10 @@ except Exception:  # 测试/独立引入环境兜底,行为与 sandbox.py 保持
 _WORKSPACE_ROOT = os.path.realpath(WORKSPACE_BASE).rstrip(os.sep)
 
 
-# 工具 → 路径字段名映射(结构化参数,可安全改写/拦截)
-# get_share_url 是 app(base_tools)自定义工具,同样吃 file_path,纳入统一约束。
+# 工具 → 路径字段名(单字段)或多字段(列表)映射(结构化参数,可安全改写/拦截)。
+# get_share_url 是 app(base_tools)自定义工具,吃 file_path;
+# transfer_file 是 bridge/multi 模式注入的跨沙箱传输工具,吃 src_path + dst_path,
+# 两个路径字段都要过同一套越权校验(否则 agent 可借它绕过,把别人的绝对路径文件传出来)。
 _PATH_TOOLS = {
     "read_file": "file_path",
     "write_file": "file_path",
@@ -54,6 +56,7 @@ _PATH_TOOLS = {
     "glob": "path",
     "grep": "path",
     "get_share_url": "file_path",
+    "transfer_file": ["src_path", "dst_path"],
 }
 
 # 宿主沙箱根前缀(用于 execute 命令串扫描;shell 里无法安全改写,只能拦)。
@@ -114,22 +117,36 @@ class SandboxPathGuardMiddleware(AgentMiddleware):
         if not isinstance(args, dict):
             return await handler(request)
 
-        # 1) 结构化路径工具:read/write/edit/ls/grep/glob/get_share_url
-        field = _PATH_TOOLS.get(name)
-        if field:
-            raw = args.get(field)
-            if isinstance(raw, str) and _is_host_absolute(raw):
-                if self._self_ws and _within_self_workspace(raw, self._self_ws):
-                    # 自己工作目录内的绝对路径 → 改写为虚拟路径放行(零往返)
-                    new_tc = dict(tc)
-                    new_args = dict(args)
-                    new_args[field] = _to_virtual(raw, self._self_ws)
-                    new_tc["args"] = new_args
-                    new_request = dataclasses.replace(request, tool_call=new_tc)
-                    return await handler(new_request)
-                # 越界/跨用户宿主绝对路径 → 拦截
-                return ToolMessage(content=_DENIED_MSG, name=name,
-                                   tool_call_id=tc.get("id", ""), status="error")
+        # 1) 结构化路径工具:read/write/edit/ls/grep/glob/get_share_url/transfer_file
+        #    字段规格可为单字段(str)或多字段(list);多字段工具(如 transfer_file
+        #    的 src_path+dst_path)任一字段越界即拦整个调用,防借传输绕过读他人文件。
+        fields_spec = _PATH_TOOLS.get(name)
+        if fields_spec:
+            fields = [fields_spec] if isinstance(fields_spec, str) else list(fields_spec)
+            rewrites = {}  # field -> 改写后的虚拟路径
+            for field in fields:
+                raw = args.get(field)
+                if not isinstance(raw, str):
+                    continue
+                # transfer_file 支持 sandbox:<名称>: 前缀指定源/目标沙箱,剥掉前缀再判路径本身
+                path_part = raw.split(":", 2)[-1] if raw.startswith("sandbox:") else raw
+                if not _is_host_absolute(path_part):
+                    continue
+                if self._self_ws and _within_self_workspace(path_part, self._self_ws):
+                    # 自己工作目录内的绝对路径 → 改写为虚拟路径(剥前缀后改写,前缀保留)
+                    virtual = _to_virtual(path_part, self._self_ws)
+                    rewrites[field] = (raw[:len(raw) - len(path_part)] + virtual) \
+                        if raw.startswith("sandbox:") else virtual
+                else:
+                    # 越界/跨用户宿主绝对路径 → 整个调用拦
+                    return ToolMessage(content=_DENIED_MSG, name=name,
+                                       tool_call_id=tc.get("id", ""), status="error")
+            if rewrites:
+                new_args = dict(args)
+                new_args.update(rewrites)
+                new_tc = dict(tc)
+                new_tc["args"] = new_args
+                return await handler(dataclasses.replace(request, tool_call=new_tc))
             return await handler(request)
 
         # 2) execute(裸 shell):命令串里的宿主绝对路径无法安全改写,只能拦

sycommon/agent/middleware/skill_write_guard.py

@@ -21,8 +21,9 @@ _WRITE_VERB_RE = re.compile(
 _REDIRECT_RE = re.compile(r'>>?')
 
 _WRITE_TOOLS = {"write_file", "edit_file"}
-_DENIED_MSG = ("Error: 系统技能 /skills/system 为只读,禁止修改/删除。"
-               "如需定制,请复制到用户技能 /skills/user/ 后编辑。")
+_DENIED_MSG = ("Error: 系统技能 /skills/system 为只读，禁止写入/修改/删除。"
+               "读取(read_file)和执行脚本(python ...)不受限，直接用即可，不要把脚本复制到工作目录再跑。"
+               "如需修改脚本本身，复制到 /skills/user/ 后编辑。")
 
 
 def _is_protected_path(p: str) -> bool:

sycommon/agent/multi_agent_team.py

@@ -46,6 +46,7 @@ from sycommon.agent.chat_events import ChatEvent, ChatEventBuilder, DEFAULT_AGEN
 from sycommon.middleware.token_tracking import TokenTrackingMiddleware
 from sycommon.middleware.tool_result_truncation import ToolResultTruncationMiddleware
 from sycommon.agent.middleware.skill_write_guard import SkillWriteGuardMiddleware
+from sycommon.agent.middleware.sandbox_path_guard import SandboxPathGuardMiddleware
 from sycommon.agent.middleware.sensitive_guard import (
     SensitiveGuardMiddleware, DowngradeState,
 )
@@ -643,6 +644,7 @@ async def create_multi_agent_team(
         TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
         summarization_mw,
         SkillWriteGuardMiddleware(),
+        SandboxPathGuardMiddleware(user_id),
     ]
     shared = config.shared_tools or [get_current_date]
 
@@ -701,6 +703,7 @@ async def create_multi_agent_team(
             TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
             coord_summarization_mw,
             SkillWriteGuardMiddleware(),
+            SandboxPathGuardMiddleware(user_id),
         ],
     )
 

{sycommon_python_lib-0.2.7a17.dist-info → sycommon_python_lib-0.2.7a19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a17
+Version: 0.2.7a19
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.7a17.dist-info → sycommon_python_lib-0.2.7a19.dist-info}/RECORD

@@ -137,7 +137,7 @@ sycommon/agent/__init__.py,sha256=mxceAeUifQ-DKvWp7ZEJIFlmOCb5wpYHPGQw3rwEN8I,43
 sycommon/agent/agent_manager.py,sha256=UhhaekEumT7g4v_Z1UB4jTp13X0n8M8erYaQdkGGWkA,13620
 sycommon/agent/chat_events.py,sha256=t7qWa6OrIWLfqtd1AnqaVP67QWkn1JxpCBTZYQpoLuM,14226
 sycommon/agent/deep_agent.py,sha256=kj4E1FT2vnSTWsfXgBymFa9iSokrUKLXnsPhxMsZNS4,74741
-sycommon/agent/multi_agent_team.py,sha256=l1hIK6ihsyIp6QCH5st74h0d0cVmZaALQAPPqbZWarc,30282
+sycommon/agent/multi_agent_team.py,sha256=RFXHB9q5j1_2B-MDZVRTcbXHdEpRIXpAhrm1yroUDYI,30460
 sycommon/agent/summarization_utils.py,sha256=bqZRFqSekNGlv2mYQPaT_s2QNA5VDTKddi2Va_SkHWc,18376
 sycommon/agent/acp/__init__.py,sha256=vQGMQYAA5-ZaejYmDZ4r4Fklqs17qH3cDXQ5pZlwj-0,1844
 sycommon/agent/acp/client.py,sha256=s-K626b9ierwyEq61gejrW0xOysvrY2PIpYFsFqSHjc,27108
@@ -147,12 +147,12 @@ sycommon/agent/acp/tool.py,sha256=yt6ohKL2y7wIZMNiLv-m5oCg5u1p5GAbqgjzQVt285Y,10
 sycommon/agent/mcp/__init__.py,sha256=iKrdDhIrFsNIkqG_kgcwNe-nOiM6uVfolKv44LfQ-FQ,636
 sycommon/agent/mcp/models.py,sha256=zda4ho-UTYOJ5oPAZPZ-vxhfDRLghUCsMroHnA2A2QQ,1490
 sycommon/agent/mcp/tool_loader.py,sha256=OQa-lE7RL2s3Lqh-kNOKaUrb130hvorB_HjyFBqZBZs,10960
-sycommon/agent/middleware/sandbox_path_guard.py,sha256=z-NcQI1DbRgGLHAnNeC9FJcrayk25CTa4W7YQt3ZvGU,6471
+sycommon/agent/middleware/sandbox_path_guard.py,sha256=5hgtf-9aqJ16BQuDwda3gXL12RbwPcexhYQPEV6H33M,7684
 sycommon/agent/middleware/sensitive_guard.py,sha256=ApmC094ogG4jIwEWRaUawTpQSDs722k0OTjdeAEQ7Qc,22159
 sycommon/agent/middleware/sitecustomize.py,sha256=Bt7XFnWV_LJo89l858AGp5VUkXwefpLGmjkCtLe-CMw,4800
 sycommon/agent/middleware/skill_api_whitelist.py,sha256=e15aJekXegPp64owSCEdUE5y0SmwCQVQCF4jnhReZNU,10958
 sycommon/agent/middleware/skill_wl_check.py,sha256=rCJ9F6aWPh8tVQBIPmcq2lKDsfwiJQduwSUku_8kXfs,3952
-sycommon/agent/middleware/skill_write_guard.py,sha256=N7EsHMc87eo5QFLjTxbIcn0kurM1LD3vlfeHSR3jVg4,2557
+sycommon/agent/middleware/skill_write_guard.py,sha256=ZbeRysGBqn0knjmDWRgPu7c8Pr5lGnjFgeEpAukSSWQ,2702
 sycommon/agent/sandbox/__init__.py,sha256=jR7LlkD4J4Y6QYyRXQClkwmqDBCCPmycV_hQV9p9YHw,4621
 sycommon/agent/sandbox/consistent_hash.py,sha256=8Jgk-W4NAD2-u5_vKRVlPmql_e0Vy4aNORiXOuzvIrs,7277
 sycommon/agent/sandbox/file_ops.py,sha256=XDqqNFlPh-VN28prkR0BSqDvebrQ_fjUDyNwqKOo-is,33805
@@ -308,8 +308,8 @@ sycommon/tools/syemail.py,sha256=BDFhgf7WDOQeTcjxJEQdu0dQhnHFPO_p3eI0-Ni3LhQ,561
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
 sycommon/xxljob/__init__.py,sha256=7eoBlQxv-B39IfRSCY2bkqdGYs1QRe1umAWd88VMEEM,86
 sycommon/xxljob/xxljob_service.py,sha256=1yifwIBNGsCIxLnQjHKiBlbsigc_zvPH-dMTZcNxe-Q,7649
-sycommon_python_lib-0.2.7a17.dist-info/METADATA,sha256=WLU3ZsuujmEd39DmVrfZ45eXMBkjteaZdI9TbqK1bz8,7962
-sycommon_python_lib-0.2.7a17.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-sycommon_python_lib-0.2.7a17.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.7a17.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.7a17.dist-info/RECORD,,
+sycommon_python_lib-0.2.7a19.dist-info/METADATA,sha256=bWoOxTQOS_rExoQGN-smQxnK-c6utsTEfK5SauR7Ar4,7962
+sycommon_python_lib-0.2.7a19.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+sycommon_python_lib-0.2.7a19.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.7a19.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.7a19.dist-info/RECORD,,