sycommon-python-lib 0.2.1a5__tar.gz → 0.2.1a7__tar.gz

{sycommon_python_lib-0.2.1a5 → sycommon_python_lib-0.2.1a7}/PKG-INFO

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

{sycommon_python_lib-0.2.1a5 → sycommon_python_lib-0.2.1a7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.1a5"
+version = "0.2.1a7"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.1a5 → sycommon_python_lib-0.2.1a7}/src/sycommon/middleware/sandbox.py

@@ -73,20 +73,27 @@ def resolve_sandbox_path(path: str, workspace: str) -> str:
     - /skills/foo.md -> {workspace}/skills/foo.md
     - skills/foo.md -> {workspace}/skills/foo.md
 
+    如果传入的绝对路径已经在工作目录内，则直接返回。
+
     同时防止路径遍历攻击，确保解析后的路径仍在工作目录内
     """
+    # 规范化路径
+    path = os.path.normpath(path)
+    workspace = os.path.normpath(workspace)
+
+    # 如果路径已经在工作目录内，直接返回
+    if path.startswith(workspace + os.sep) or path == workspace:
+        return path
+
     # 移除开头的 / 使其成为相对路径
     if os.path.isabs(path):
-        path = path.lstrip('/')
-
-    # 规范化路径，防止 ../ 等路径遍历
-    path = os.path.normpath(path)
+        path = path.lstrip(os.sep)
 
     # 拼接到工作目录
     resolved = os.path.normpath(os.path.join(workspace, path))
 
     # 安全检查：确保最终路径在工作目录内
-    if not resolved.startswith(workspace):
+    if not resolved.startswith(workspace + os.sep) and resolved != workspace:
         raise ValueError(f"Path traversal detected: {path}")
 
     return resolved
@@ -417,7 +424,7 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
 
     @sandbox_router.post("/write", response_model=WriteResponse)
     async def write_file(req: WriteRequest):
-        """写入新文件"""
+        """写入文件（如果文件存在则覆盖）"""
         workspace = get_user_workspace(req.user_id)
         try:
             file_path = resolve_sandbox_path(req.file_path, workspace)
@@ -430,18 +437,20 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
         try:
             content = base64.b64decode(req.content).decode('utf-8')
 
-            if os.path.exists(file_path):
-                SYLogger.error(f"[Sandbox Server] 写入失败: 文件已存在 {file_path}")
-                return WriteResponse(error=f"File '{file_path}' already exists", path=None)
-
+            # 创建父目录（如果不存在）
             parent = os.path.dirname(file_path)
             if parent:
                 os.makedirs(parent, exist_ok=True)
 
+            # 检查文件是否已存在（用于日志）
+            is_overwrite = os.path.exists(file_path)
+
+            # 直接写入，如果文件存在则覆盖
             with open(file_path, 'w') as f:
                 f.write(content)
 
-            SYLogger.info(f"[Sandbox Server] 写入成功: {file_path} ({len(content)} 字符)")
+            action = "覆盖" if is_overwrite else "新建"
+            SYLogger.info(f"[Sandbox Server] 写入成功({action}): {file_path} ({len(content)} 字符)")
             return WriteResponse(error=None, path=file_path)
 
         except Exception as e:

{sycommon_python_lib-0.2.1a5 → sycommon_python_lib-0.2.1a7}/src/sycommon_python_lib.egg-info/PKG-INFO

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