beswarm 0.1.87__py3-none-any.whl → 0.1.88__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.33",
+    version="1.1.34",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

beswarm/aient/src/aient/utils/scripts.py

@@ -1,6 +1,7 @@
 import os
 import re
 import json
+import fnmatch
 import requests
 import urllib.parse
 
@@ -241,30 +242,65 @@ import subprocess
 readonly_paths_str = os.getenv('SANDBOX_READONLY_PATHS', '')
 READONLY_PATHS = [p for p in readonly_paths_str.split(os.pathsep) if p]
 
+# 新增: 从环境变量 'SANDBOX_NO_READ_PATHS' 读取禁止读取的路径列表
+no_read_paths_str = os.getenv('SANDBOX_NO_READ_PATHS', '')
+NO_READ_PATHS = [p for p in no_read_paths_str.split(os.pathsep) if p]
+
 # --- 子进程注入代码 (更智能的版本) ---
 INJECTION_CODE = """
 import builtins
 import os
 import sys
 import runpy
+import fnmatch
 
 # 1. 从环境变量中获取沙箱规则并设置补丁
 # 子进程从和父进程完全相同的环境变量中读取配置
 readonly_paths_str = os.getenv('SANDBOX_READONLY_PATHS', '')
 readonly_paths = [os.path.abspath(p) for p in readonly_paths_str.split(os.pathsep) if p]
+no_read_paths_str = os.getenv('SANDBOX_NO_READ_PATHS', '')
+no_read_paths = [os.path.abspath(p) for p in no_read_paths_str.split(os.pathsep) if p]
 original_open = builtins.open
 
 def _is_path_protected(target_path):
     abs_target_path = os.path.abspath(target_path)
-    for readonly_path in readonly_paths:
-        if abs_target_path == readonly_path or abs_target_path.startswith(readonly_path + os.sep):
-            return True
+    for protected_pattern in readonly_paths:
+        # 检查是否是 glob 模式
+        is_glob = '*' in protected_pattern or '?' in protected_pattern or '[' in protected_pattern
+        if is_glob:
+            if fnmatch.fnmatch(abs_target_path, protected_pattern):
+                return True
+        else:
+            # 兼容旧的精确/目录匹配
+            if abs_target_path == protected_pattern or abs_target_path.startswith(protected_pattern + os.sep):
+                return True
+    return False
+
+def _is_path_no_read(target_path):
+    abs_target_path = os.path.abspath(target_path)
+    for no_read_pattern in no_read_paths:
+        # 检查是否是 glob 模式
+        is_glob = '*' in no_read_pattern or '?' in no_read_pattern or '[' in no_read_pattern
+        if is_glob:
+            if fnmatch.fnmatch(abs_target_path, no_read_pattern):
+                return True
+        else:
+            # 兼容旧的精确/目录匹配
+            if abs_target_path == no_read_pattern or abs_target_path.startswith(no_read_pattern + os.sep):
+                return True
     return False
 
 def _sandboxed_open(file, mode='r', *args, **kwargs):
+    # 检查写保护
     is_write_mode = 'w' in mode or 'a' in mode or 'x' in mode or '+' in mode
     if is_write_mode and _is_path_protected(file):
-        raise PermissionError(f"路径 '{file}' 被设为只读，禁止写入。")
+        raise PermissionError(f"路径 '{file}' 被禁止写入。")
+
+    # 检查读保护 (默认模式是 'r')
+    is_read_mode = 'r' in mode or '+' in mode
+    if is_read_mode and _is_path_no_read(file):
+        raise PermissionError(f"路径 '{file}' 被禁止读取。")
+
     return original_open(file, mode, *args, **kwargs)
 
 builtins.open = _sandboxed_open
@@ -316,24 +352,52 @@ else:
 
 class Sandbox:
     """一个通过猴子补丁实现文件访问控制的沙箱，支持向子进程注入。"""
-    def __init__(self, readonly_paths):
+    def __init__(self, readonly_paths, no_read_paths):
         self._readonly_paths = [os.path.abspath(p) for p in readonly_paths]
+        self._no_read_paths = [os.path.abspath(p) for p in no_read_paths]
         self._original_open = builtins.open
-        self.is_active = bool(self._readonly_paths) # 如果没有只读路径，则沙箱不激活
+        self.is_active = bool(self._readonly_paths or self._no_read_paths) # 如果有任一规则，则沙箱激活
 
     def _is_path_protected(self, target_path):
-        """检查给定路径是否位于或就是只读路径之一"""
+        """检查给定路径是否位于或就是只读路径之一（支持 glob 模式）。"""
         abs_target_path = os.path.abspath(target_path)
-        for readonly_path in self._readonly_paths:
-            if abs_target_path == readonly_path or abs_target_path.startswith(readonly_path + os.sep):
-                return True
+        for protected_pattern in self._readonly_paths:
+            is_glob = '*' in protected_pattern or '?' in protected_pattern or '[' in protected_pattern
+            if is_glob:
+                if fnmatch.fnmatch(abs_target_path, protected_pattern):
+                    return True
+            else:
+                # 兼容旧的精确/目录匹配
+                if abs_target_path == protected_pattern or abs_target_path.startswith(protected_pattern + os.sep):
+                    return True
+        return False
+
+    def _is_path_no_read(self, target_path):
+        """检查给定路径是否位于或就是禁止读取的路径之一（支持 glob 模式）。"""
+        abs_target_path = os.path.abspath(target_path)
+        for no_read_pattern in self._no_read_paths:
+            is_glob = '*' in no_read_pattern or '?' in no_read_pattern or '[' in no_read_pattern
+            if is_glob:
+                if fnmatch.fnmatch(abs_target_path, no_read_pattern):
+                    return True
+            else:
+                # 兼容旧的精确/目录匹配
+                if abs_target_path == no_read_pattern or abs_target_path.startswith(no_read_pattern + os.sep):
+                    return True
         return False
 
     def _sandboxed_open(self, file, mode='r', *args, **kwargs):
         """我们自己编写的、带安全检查的 open 函数代理"""
+        # 检查写保护
         is_write_mode = 'w' in mode or 'a' in mode or 'x' in mode or '+' in mode
         if is_write_mode and self._is_path_protected(file):
-            raise PermissionError(f"路径 '{file}' 被设为只读，禁止写入。")
+            raise PermissionError(f"路径 '{file}' 被禁止写入。")
+
+        # 检查读保护 (默认模式是 'r')
+        is_read_mode = 'r' in mode or '+' in mode
+        if is_read_mode and self._is_path_no_read(file):
+            raise PermissionError(f"路径 '{file}' 被禁止读取。")
+
         return self._original_open(file, mode, *args, **kwargs)
 
     def enable(self):
@@ -348,6 +412,10 @@ class Sandbox:
             return
         builtins.open = self._original_open
 
+    def _update_env_var(self, var_name, path_list):
+        """辅助函数，用于更新环境变量，确保子进程能继承最新的沙箱规则。"""
+        os.environ[var_name] = os.pathsep.join(path_list)
+
     def add_readonly_path(self, path: str):
         """动态添加一个新的只读路径。如果沙箱因此从非激活状态变为激活状态，则会启用沙箱。"""
         if not path:
@@ -358,6 +426,7 @@ class Sandbox:
         abs_path = os.path.abspath(path)
         if abs_path not in self._readonly_paths:
             self._readonly_paths.append(abs_path)
+            self._update_env_var('SANDBOX_READONLY_PATHS', self._readonly_paths)
             self.is_active = True # 确保沙箱被激活
 
         # 如果沙箱之前未激活，但现在因为添加了路径而激活了，则启用它
@@ -366,6 +435,23 @@ class Sandbox:
 
         return "Success"
 
+    def add_no_read_path(self, path: str):
+        """动态添加一个新的禁止读取的路径。"""
+        if not path:
+            return "Fail"
+
+        was_active = self.is_active
+        abs_path = os.path.abspath(path)
+        if abs_path not in self._no_read_paths:
+            self._no_read_paths.append(abs_path)
+            self._update_env_var('SANDBOX_NO_READ_PATHS', self._no_read_paths)
+            self.is_active = True
+
+        if not was_active and self.is_active:
+            self.enable()
+
+        return "Success"
+
     def __enter__(self):
         """进入 'with' 块时，应用猴子补丁"""
         self.enable()
@@ -408,7 +494,7 @@ class Sandbox:
 
 # --- 全局沙箱实例 ---
 # 沙箱现在会自动从环境变量中读取配置
-sandbox = Sandbox(readonly_paths=READONLY_PATHS)
+sandbox = Sandbox(readonly_paths=READONLY_PATHS, no_read_paths=NO_READ_PATHS)
 sandbox.enable() # 在模块加载时全局启用沙箱
 
 from dataclasses import dataclass

{beswarm-0.1.87.dist-info → beswarm-0.1.88.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.1.87
+Version: 0.1.88
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{beswarm-0.1.87.dist-info → beswarm-0.1.88.dist-info}/RECORD

@@ -2,7 +2,7 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=1jNxVXjfhb-A8CVHoudRxytV4qDT6FZIIk1NRCCE1Ns,31365
 beswarm/utils.py,sha256=cOYwuONpNG_dkSYIvdEqQOxRUdIy0Bh9CTYkvKKskdw,2816
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=NkFRjOyvZkKzSLI_JMU1fJkQzf7gLfSPGt7nj-JDnpg,487
+beswarm/aient/setup.py,sha256=NJ0hlKbFBw5PK_tZYBvhIIrBUzmgGiAQzJ07Eu3CKdg,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -39,7 +39,7 @@ beswarm/aient/src/aient/plugins/websearch.py,sha256=FsUxM9GL4AAjmYJ8TS2jSqv4qfCA
 beswarm/aient/src/aient/plugins/write_file.py,sha256=7spYxloI_aUbeANEQK-oXrGPoBqSfsD7sdfMAWlNxhU,3656
 beswarm/aient/src/aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 beswarm/aient/src/aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-beswarm/aient/src/aient/utils/scripts.py,sha256=8NJCASleffBsA20E3K7HvChCH6rb-7-Qa_ygXXpEsCE,37051
+beswarm/aient/src/aient/utils/scripts.py,sha256=FUPnJIMRzXQLW6nGdx4MO72iUEk68PyZBUHg5fNZPmw,40852
 beswarm/aient/test/chatgpt.py,sha256=Hvl7FuDt1c74N5TVBmhErOPvJbJJzA7FNp5VoZM4u30,4957
 beswarm/aient/test/claude.py,sha256=IyB4qI1eJLwlSfDNSnt2FhbQWYyBighHUjJxEXc3osQ,1095
 beswarm/aient/test/test.py,sha256=rldnoLQdtRR8IKFSIzTti7eIK2MpPMoi9gL5qD8_K44,29
@@ -129,7 +129,7 @@ beswarm/tools/search_arxiv.py,sha256=GpuIOYX8T0iRC-X-hmuR9AUJVn15WWZq864DaoC7BUc
 beswarm/tools/search_web.py,sha256=B24amOnGHnmdV_6S8bw8O2PdhZRRIDtJjg-wXcfP7dQ,11859
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=VOulEZBEc5nF2RBR9aLYs0vT7WBD-r2mlWH5ueEo4hM,16007
-beswarm-0.1.87.dist-info/METADATA,sha256=CML-RDiBOUvDdvhSn8ITmQevVj4kUkSIB6rroWnThSU,3553
-beswarm-0.1.87.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.1.87.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.87.dist-info/RECORD,,
+beswarm-0.1.88.dist-info/METADATA,sha256=qzPOL8McdAQ-iL748wzyb0xaq_-38645_1PwZ9pQiik,3553
+beswarm-0.1.88.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.1.88.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.88.dist-info/RECORD,,