Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.
JavaScript agent-orchestrationagentic-workflowai-agentsai-codingclaude-codecode-reviewcodebuddycodexcoding-agentscursordeveloper-toolshuman-on-the-loopllmmcpmulti-agentsdlcself-hostedsopworkflow-automationworkflow-engine
【架构优化】从 readSkillZipBytes 中拆出 zip 条目筛选与顶层目录剥离 skillZipEntries (#512)
fx-kurumi4f8bc98a2708
diff --git a/internal/httpapi/skill_files.go b/internal/httpapi/skill_files.goindex 2dc4d9df..e5bb13ea 100644--- a/internal/httpapi/skill_files.go+++ b/internal/httpapi/skill_files.go@@ -263,6 +263,44 @@ func readSkillZipBytes(raw []byte, label string, seen map[string]bool) ([]repo.Sreturn nil, fmt.Errorf("%s 不是有效的 zip 文件", label)}+ names, files, err := skillZipEntries(reader, label)+ if err != nil {+ return nil, err+ }++ var out []repo.SkillFileInput+ var total int64+ for _, name := range names {+ if seen[name] {+ return nil, fmt.Errorf("上传中存在重复路径 %s", name)+ }+ rc, err := files[name].Open()+ if err != nil {+ return nil, fmt.Errorf("无法解压 %s", name)+ }+ content, err := io.ReadAll(io.LimitReader(rc, domain.SkillFileMaxBytes+1))+ rc.Close()+ if err != nil {+ return nil, fmt.Errorf("无法解压 %s", name)+ }+ if int64(len(content)) > domain.SkillFileMaxBytes {+ return nil, fmt.Errorf("zip 内文件 %s 超过 1MB 限制", name)+ }+ total += int64(len(content))+ if total > domain.SkillTotalMaxBytes {+ return nil, fmt.Errorf("解压后总量超过 64MB 限制")+ }+ seen[name] = true+ out = append(out, repo.SkillFileInput{Path: name, Content: content, Mode: uint32(files[name].Mode().Perm())})+ }+ return out, nil+}++// skillZipEntries lists the regular files of a skill zip, normalizing their+// paths, dropping macOS metadata, validating each path and stripping a single+// shared top-level directory. It returns the ordered paths and the zip entry+// for each path.+func skillZipEntries(reader *zip.Reader, label string) ([]string, map[string]*zip.File, error) {names := make([]string, 0, len(reader.File))files := make(map[string]*zip.File)for _, f := range reader.File {@@ -270,7 +308,7 @@ func readSkillZipBytes(raw []byte, label string, seen map[string]bool) ([]repo.Scontinue}if !f.Mode().IsRegular() { // reject symlinks and other non-regular entries- return nil, fmt.Errorf("zip 内含非常规文件条目 %s", f.Name)+ return nil, nil, fmt.Errorf("zip 内含非常规文件条目 %s", f.Name)}name := strings.ReplaceAll(f.Name, "\\", "/")name = strings.TrimPrefix(path.Clean(name), "./")@@ -278,13 +316,13 @@ func readSkillZipBytes(raw []byte, label string, seen map[string]bool) ([]repo.Scontinue}if err := domain.ValidateRelativeFilePath(name); err != nil {- return nil, fmt.Errorf("zip 内含无效路径 %q", f.Name)+ return nil, nil, fmt.Errorf("zip 内含无效路径 %q", f.Name)}names = append(names, name)files[name] = f}if len(names) == 0 {- return nil, fmt.Errorf("zip %s 中没有可用的文件", label)+ return nil, nil, fmt.Errorf("zip %s 中没有可用的文件", label)}// Strip a single shared top-level directory: zipping a folder produces// "my-skill/..." for every entry.@@ -293,7 +331,7 @@ func readSkillZipBytes(raw []byte, label string, seen map[string]bool) ([]repo.Sfor _, name := range names {short := strings.Join(strings.Split(name, "/")[1:], "/")if err := domain.ValidateRelativeFilePath(short); err != nil {- return nil, fmt.Errorf("zip 内含无效路径 %q", name)+ return nil, nil, fmt.Errorf("zip 内含无效路径 %q", name)}files[short] = files[name]delete(files, name)@@ -301,33 +339,7 @@ func readSkillZipBytes(raw []byte, label string, seen map[string]bool) ([]repo.S}names = stripped}-- var out []repo.SkillFileInput- var total int64- for _, name := range names {- if seen[name] {- return nil, fmt.Errorf("上传中存在重复路径 %s", name)- }- rc, err := files[name].Open()- if err != nil {- return nil, fmt.Errorf("无法解压 %s", name)- }- content, err := io.ReadAll(io.LimitReader(rc, domain.SkillFileMaxBytes+1))- rc.Close()- if err != nil {- return nil, fmt.Errorf("无法解压 %s", name)- }- if int64(len(content)) > domain.SkillFileMaxBytes {- return nil, fmt.Errorf("zip 内文件 %s 超过 1MB 限制", name)- }- total += int64(len(content))- if total > domain.SkillTotalMaxBytes {- return nil, fmt.Errorf("解压后总量超过 64MB 限制")- }- seen[name] = true- out = append(out, repo.SkillFileInput{Path: name, Content: content, Mode: uint32(files[name].Mode().Perm())})- }- return out, nil+ return names, files, nil}func top(name string) string {diff --git a/internal/httpapi/skill_zip_entries_paths_test.go b/internal/httpapi/skill_zip_entries_paths_test.gonew file mode 100644index 00000000..8490b1b9--- /dev/null+++ b/internal/httpapi/skill_zip_entries_paths_test.go@@ -0,0 +1,48 @@+package httpapi++import (+ "slices"+ "strings"+ "testing"+)++func TestSkillZipEntriesSkipsDirsAndNormalizesPaths(t *testing.T) {+ // Directory entries are skipped, backslashes and "./" are normalized,+ // and the shared top-level directory is still stripped afterwards.+ raw := zipBytes(t, map[string]string{+ "pkg/": "",+ "pkg/sub/": "",+ "./pkg/SKILL.md": "# a",+ `pkg\sub\run.sh`: "echo",+ }, nil)+ names, files, err := skillZipEntries(openTestZip(t, raw), "pkg.zip")+ if err != nil {+ t.Fatal(err)+ }+ got := slices.Clone(names)+ slices.Sort(got)+ if !slices.Equal(got, []string{"SKILL.md", "sub/run.sh"}) {+ t.Fatalf("names = %v", got)+ }+ if files["sub/run.sh"] == nil || files["sub/run.sh"].Name != `pkg\sub\run.sh` {+ t.Fatalf("entry for sub/run.sh = %+v", files["sub/run.sh"])+ }+ if len(files) != 2 {+ t.Fatalf("files map = %v", files)+ }+}++func TestSkillZipEntriesRejectsInvalidPaths(t *testing.T) {+ for _, name := range []string{"../escape.txt", "pkg/../../escape.txt", "/abs.txt", "c:/x.txt"} {+ t.Run(name, func(t *testing.T) {+ raw := zipBytes(t, map[string]string{"pkg/SKILL.md": "x", name: "evil"}, nil)+ names, files, err := skillZipEntries(openTestZip(t, raw), "bad.zip")+ if err == nil || !strings.Contains(err.Error(), "zip 内含无效路径") || !strings.Contains(err.Error(), name) {+ t.Fatalf("err = %v", err)+ }+ if names != nil || files != nil {+ t.Fatalf("invalid archive returned entries: %v %v", names, files)+ }+ })+ }+}diff --git a/internal/httpapi/skill_zip_entries_test.go b/internal/httpapi/skill_zip_entries_test.gonew file mode 100644index 00000000..1db845c4--- /dev/null+++ b/internal/httpapi/skill_zip_entries_test.go@@ -0,0 +1,77 @@+package httpapi++import (+ "archive/zip"+ "bytes"+ "io/fs"+ "slices"+ "strings"+ "testing"+)++func openTestZip(t *testing.T, raw []byte) *zip.Reader {+ t.Helper()+ reader, err := zip.NewReader(bytes.NewReader(raw), int64(len(raw)))+ if err != nil {+ t.Fatal(err)+ }+ return reader+}++func TestSkillZipEntriesStripsSharedTopDirAndMacMetadata(t *testing.T) {+ raw := zipBytes(t, map[string]string{+ "pkg/SKILL.md": "# a",+ "pkg/b/c.txt": "c",+ "pkg/.DS_Store": "",+ "__MACOSX/pkg/._SKILL.md": "",+ }, nil)+ names, files, err := skillZipEntries(openTestZip(t, raw), "pkg.zip")+ if err != nil {+ t.Fatal(err)+ }+ got := slices.Clone(names)+ slices.Sort(got)+ if !slices.Equal(got, []string{"SKILL.md", "b/c.txt"}) {+ t.Fatalf("names = %v", got)+ }+ if len(files) != len(names) {+ t.Fatalf("files map has %d entries, want %d", len(files), len(names))+ }+ for _, name := range names {+ if files[name] == nil {+ t.Fatalf("missing zip entry for %s", name)+ }+ }+}++func TestSkillZipEntriesKeepsMultipleTopDirs(t *testing.T) {+ raw := zipBytes(t, map[string]string{"a/one.md": "1", "b/two.md": "2"}, nil)+ names, _, err := skillZipEntries(openTestZip(t, raw), "multi.zip")+ if err != nil {+ t.Fatal(err)+ }+ slices.Sort(names)+ if !slices.Equal(names, []string{"a/one.md", "b/two.md"}) {+ t.Fatalf("names = %v", names)+ }+}++func TestSkillZipEntriesRejectsInvalidArchives(t *testing.T) {+ cases := []struct {+ name string+ entries map[string]string+ modes map[string]fs.FileMode+ want string+ }{+ {name: "symlink", entries: map[string]string{"SKILL.md": "x", "link": "SKILL.md"}, modes: map[string]fs.FileMode{"link": fs.ModeSymlink | 0o777}, want: "非常规文件条目 link"},+ {name: "only metadata", entries: map[string]string{"__MACOSX/._x": "", ".DS_Store": ""}, want: "zip empty.zip 中没有可用的文件"},+ }+ for _, tc := range cases {+ t.Run(tc.name, func(t *testing.T) {+ raw := zipBytes(t, tc.entries, tc.modes)+ if _, _, err := skillZipEntries(openTestZip(t, raw), "empty.zip"); err == nil || !strings.Contains(err.Error(), tc.want) {+ t.Fatalf("err = %v, want containing %q", err, tc.want)+ }+ })+ }+}