fix(aibox/skills): Batch M 波次2 路径边界收口(S2/S3/S6/S9/S10/S11/S12/S13)

- gitclient: delete 限工作区内 .git 仓库(S2);分支名白名单防选项注入(S3)
- camera/screenshot: --filename 拒绝分隔符/绝对路径/父目录引用(S9/S10)
- facerec: person_name 白名单(兼容中文)接入 add/remove/get-info(S11)
- vision: 图片魔数白名单校验,data URL MIME 按实测类型(S12)
- sftp-transfer: listdir 条目名双向过滤防恶意服务端目录逃逸(S6)
- test-auto-appimage: exec_name 白名单防 sed 替换注入(S13)

测试 493 passed / 4 failed(既有平台环境项)/ 1 skipped,零回归
This commit is contained in:
qing committed 2026-08-20 13:11:07 +08:00
1 parent 5dc5ec9af2
commit 9064750f33
8 files changed
+133 -5

No files matched your search

+22 -2
View File
@@ -3,6 +3,7 @@
import sys
import os
import re
import argparse
import requests
from datetime import datetime
@@ -35,6 +36,13 @@ MAX_CONTENT_PREVIEW = 1000
MAX_LIST_PREVIEW = 20
MAX_STRING_LENGTH = 200
# S3:分支/ref 白名单——首字符必须为字母或数字,防止以 '-' 开头的值被 git 解析为选项(选项注入)
_REF_RE = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._/@+-]{0,127}$")
def _valid_ref(name: str) -> bool:
return bool(name) and bool(_REF_RE.match(name))
# ==================== GitHub工具类 ====================
@@ -165,6 +173,8 @@ class GitHubTool:
if os.path.exists(target_dir):
return f"⚠️ 仓库已存在: {target_dir}\n💡 使用 pull 命令拉取更新"
if branch and not _valid_ref(branch):
return f"❌ 非法分支名: {branch}"
clone_url = f"https://github.com/{repo}.git"
cmd = ["clone"]
if depth > 0:
@@ -186,6 +196,8 @@ class GitHubTool:
br = self._run_git(repo_path, ["branch", "--show-current"])
branch = br["stdout"] if br["success"] else None
if branch and not _valid_ref(branch):
return f"❌ 非法分支名: {branch}"
result = self._run_git(repo_path, ["pull", "origin", branch] if branch else ["pull"])
if result["success"]:
return f"✅ 拉取成功\n {result['stdout'] or '已是最新'}"
@@ -199,6 +211,8 @@ class GitHubTool:
br = self._run_git(repo_path, ["branch", "--show-current"])
branch = br["stdout"] if br["success"] else None
if branch and not _valid_ref(branch):
return f"❌ 非法分支名: {branch}"
cmd = ["push"]
if force:
cmd.append("--force")
@@ -284,9 +298,15 @@ class GitHubTool:
return "⚠️ 需要确认删除,请添加 --confirm 参数"
if not os.path.exists(repo_path):
return f"❌ 路径不存在: {repo_path}"
# S2:仅允许删除 WORKSPACE 内的 git 仓库,防止任意目录递归删除
workspace = os.path.realpath(WORKSPACE_DIR)
real_path = os.path.realpath(repo_path)
if not real_path.startswith(workspace + os.sep) \
or not os.path.isdir(os.path.join(real_path, ".git")):
return f"❌ 仅允许删除工作区({workspace})内的 git 仓库目录"
try:
shutil.rmtree(repo_path)
return f"✅ 已删除: {repo_path}"
shutil.rmtree(real_path)
return f"✅ 已删除: {real_path}"
except Exception as e:
return f"❌ 删除失败: {e}"