feat(jarvis): 本地沙箱改多目录白名单 + 让它知道自己能操作这台电脑
单目录沙箱做不了"操作我电脑"——只能在一个文件夹里打转,跨目录整理直接没戏。 且模型压根不知道 shell 除了跑脚本还能开 App、控 App、触发快捷指令。 沙箱:单根 → 多根白名单 - 用户授权多个目录(设置里每行一个,可一键填入桌面/下载/文档),其余一律拒 - 路径改绝对路径(多根之下相对路径没有唯一含义),支持 ~ 展开,相对路径兜底按首个根解释 - local_list_dir 留空 path = 返回授权目录清单 → 模型据此自己发现"我能访问哪儿" - local_exec 可指定 cwd(须在授权目录内) - 防逃逸不变:软链解析后必须落在某个根内,越界即拒(单测覆盖 ../ 与软链逃逸) 告诉模型它能干什么 - local_exec 描述展开:文件整理(mv/cp/find)、mdfind 全盘搜、open 开应用/文件/网址、 osascript 控制 Mac App、shortcuts run/list 触发快捷指令、系统信息 - 语音系统提示词把 JARVIS 定位成"这台电脑的操作者",并要求先想清用哪个工具再动手 live 验证(两个授权目录): ① "你能访问哪些目录,里面有什么" → 自主先查授权清单、再逐个列举,答全对 ② "把下载里的图片挪到桌面" → 自主 mv,文件真的跨目录移动了 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -36,36 +36,45 @@ type resp struct {
|
||||
|
||||
func main() {
|
||||
gw := flag.String("gw", "ws://localhost:8080", "gateway WS 基址")
|
||||
dir := flag.String("dir", ".", "沙箱工作目录")
|
||||
dir := flag.String("dir", ".", "授权目录,逗号分隔(模拟桌面端的多目录白名单)")
|
||||
flag.Parse()
|
||||
token := os.Getenv("LOCALSIM_TOKEN")
|
||||
if token == "" {
|
||||
log.Fatal("缺 LOCALSIM_TOKEN(用户 JWT)")
|
||||
}
|
||||
root, err := filepath.Abs(*dir)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
var roots []string
|
||||
for _, d := range strings.Split(*dir, ",") {
|
||||
if d = strings.TrimSpace(d); d == "" {
|
||||
continue
|
||||
}
|
||||
abs, err := filepath.Abs(d)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
roots = append(roots, abs)
|
||||
}
|
||||
if len(roots) == 0 {
|
||||
log.Fatal("至少一个目录")
|
||||
}
|
||||
|
||||
url := strings.TrimRight(*gw, "/") + "/api/v1/local/runner?token=" + token
|
||||
// 断线自动重连(对齐真桌面端 runner 的 5s 退避):网关重启时联调不用手动重拉。
|
||||
for {
|
||||
if err := serveOnce(url, root); err != nil {
|
||||
if err := serveOnce(url, roots); err != nil {
|
||||
log.Printf("连接断开(5s 后重连): %v", err)
|
||||
}
|
||||
time.Sleep(5 * time.Second)
|
||||
}
|
||||
}
|
||||
|
||||
func serveOnce(url, root string) error {
|
||||
func serveOnce(url string, roots []string) error {
|
||||
conn, _, err := websocket.DefaultDialer.Dial(url, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer conn.Close()
|
||||
log.Printf("已注册为本地执行器 workdir=%s", root)
|
||||
log.Printf("已注册为本地执行器 授权目录=%s", strings.Join(roots, "、"))
|
||||
|
||||
hello, _ := json.Marshal(resp{ID: "hello", OK: true, Workdir: root})
|
||||
hello, _ := json.Marshal(resp{ID: "hello", OK: true, Workdir: strings.Join(roots, "、")})
|
||||
_ = conn.WriteMessage(websocket.TextMessage, hello)
|
||||
|
||||
for {
|
||||
@@ -78,18 +87,40 @@ func serveOnce(url, root string) error {
|
||||
continue
|
||||
}
|
||||
log.Printf("收到调用 tool=%s args=%v", r.Tool, r.Args)
|
||||
out, _ := json.Marshal(handle(root, &r))
|
||||
out, _ := json.Marshal(handle(roots, &r))
|
||||
if err := conn.WriteMessage(websocket.TextMessage, out); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func handle(root string, r *req) *resp {
|
||||
func handle(roots []string, r *req) *resp {
|
||||
root := roots[0]
|
||||
rel, _ := r.Args["path"].(string)
|
||||
p := filepath.Join(root, filepath.Clean("/"+rel)) // 简版沙箱(联调工具;正式沙箱在桌面端)
|
||||
// 简版沙箱(联调工具;正式沙箱在桌面端 resolveAllowed):绝对路径须落在某个授权根内。
|
||||
p := rel
|
||||
if p == "" {
|
||||
p = root
|
||||
} else if !filepath.IsAbs(p) {
|
||||
p = filepath.Join(root, filepath.Clean("/"+p))
|
||||
}
|
||||
p = filepath.Clean(p)
|
||||
inRoot := false
|
||||
for _, rt := range roots {
|
||||
if p == rt || strings.HasPrefix(p, rt+string(filepath.Separator)) {
|
||||
inRoot = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !inRoot {
|
||||
return &resp{ID: r.ID, OK: false, Error: "路径不在授权目录内: " + p}
|
||||
}
|
||||
switch r.Tool {
|
||||
case "local_list_dir":
|
||||
if strings.TrimSpace(rel) == "" {
|
||||
data, _ := json.Marshal(map[string]any{"authorized_dirs": roots})
|
||||
return &resp{ID: r.ID, OK: true, Content: string(data)}
|
||||
}
|
||||
ents, err := os.ReadDir(p)
|
||||
if err != nil {
|
||||
return &resp{ID: r.ID, OK: false, Error: err.Error()}
|
||||
|
||||
Reference in New Issue
Block a user