Skip to content

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.

【架构优化】从 writeDownloadZIP 中拆出 tar 成员校验 downloadEntryName 与 ZIP 成员写出 copyDownloadMember (#637) (#638)

fx-kurumie36c3051dd4b
diff --git a/internal/preview/download.go b/internal/preview/download.go
index 679f58c7..c518aa5b 100644
--- a/internal/preview/download.go
+++ b/internal/preview/download.go
@@ -105,16 +105,13 @@ func writeDownloadZIP(ctx context.Context, src io.Reader, entryFile string, limi
if err != nil {
return err
}
- if hdr.Typeflag == tar.TypeDir {
- continue
- }
- if (hdr.Typeflag != tar.TypeReg && hdr.Typeflag != tar.TypeRegA) || hdr.Linkname != "" {
- return ErrUnsupportedEntry
- }
- name, err := SanitizeArchiveMember(hdr.Name)
+ name, skip, err := downloadEntryName(hdr)
if err != nil {
return err
}
+ if skip {
+ continue
+ }
if seen[name] {
return fmt.Errorf("duplicate preview file %q", name)
}
@@ -123,19 +120,9 @@ func writeDownloadZIP(ctx context.Context, src io.Reader, entryFile string, limi
}
seen[name] = true
expanded += hdr.Size
- zh := &zip.FileHeader{Name: name, Method: zip.Deflate, Modified: hdr.ModTime}
- zh.SetMode(0o644)
- member, err := zw.CreateHeader(zh)
- if err != nil {
+ if err := copyDownloadMember(ctx, zw, tr, name, hdr); err != nil {
return err
}
- n, err := io.Copy(member, &downloadReader{ctx, tr})
- if err != nil {
- return err
- }
- if n != hdr.Size {
- return fmt.Errorf("preview file %q size mismatch", name)
- }
}
if !seen[entryFile] {
return ErrMissingIndex
@@ -146,6 +133,44 @@ func writeDownloadZIP(ctx context.Context, src io.Reader, entryFile string, limi
return zw.Close()
}
+// downloadEntryName validates one tar header for the download ZIP. Directories
+// are reported as skip; anything other than a plain regular file (including
+// regular entries carrying a link name) is rejected with ErrUnsupportedEntry.
+// For accepted files it returns the sanitized member name.
+func downloadEntryName(hdr *tar.Header) (name string, skip bool, err error) {
+ if hdr.Typeflag == tar.TypeDir {
+ return "", true, nil
+ }
+ if (hdr.Typeflag != tar.TypeReg && hdr.Typeflag != tar.TypeRegA) || hdr.Linkname != "" {
+ return "", false, ErrUnsupportedEntry
+ }
+ name, err = SanitizeArchiveMember(hdr.Name)
+ if err != nil {
+ return "", false, err
+ }
+ return name, false, nil
+}
+
+// copyDownloadMember writes one deflated 0644 ZIP member named name, keeping
+// the tar modification time, and copies src into it while honoring ctx. The
+// copied byte count must match hdr.Size.
+func copyDownloadMember(ctx context.Context, zw *zip.Writer, src io.Reader, name string, hdr *tar.Header) error {
+ zh := &zip.FileHeader{Name: name, Method: zip.Deflate, Modified: hdr.ModTime}
+ zh.SetMode(0o644)
+ member, err := zw.CreateHeader(zh)
+ if err != nil {
+ return err
+ }
+ n, err := io.Copy(member, &downloadReader{ctx, src})
+ if err != nil {
+ return err
+ }
+ if n != hdr.Size {
+ return fmt.Errorf("preview file %q size mismatch", name)
+ }
+ return nil
+}
+
type downloadReader struct {
ctx context.Context
src io.Reader
diff --git a/internal/preview/download_member_test.go b/internal/preview/download_member_test.go
new file mode 100644
index 00000000..32a0a581
--- /dev/null
+++ b/internal/preview/download_member_test.go
@@ -0,0 +1,99 @@
+package preview
+
+import (
+ "archive/tar"
+ "archive/zip"
+ "bytes"
+ "context"
+ "errors"
+ "io"
+ "strings"
+ "testing"
+ "time"
+)
+
+func TestDownloadEntryNameSkipsDirectories(t *testing.T) {
+ name, skip, err := downloadEntryName(&tar.Header{Name: "assets/", Typeflag: tar.TypeDir})
+ if err != nil || !skip || name != "" {
+ t.Fatalf("dir = (%q, %v, %v), want skip", name, skip, err)
+ }
+}
+
+func TestDownloadEntryNameRejectsNonRegularEntries(t *testing.T) {
+ for _, hdr := range []*tar.Header{
+ {Name: "link", Typeflag: tar.TypeSymlink, Linkname: "index.html"},
+ {Name: "hard", Typeflag: tar.TypeLink, Linkname: "index.html"},
+ {Name: "fifo", Typeflag: tar.TypeFifo},
+ {Name: "reg-with-link", Typeflag: tar.TypeReg, Linkname: "index.html"},
+ } {
+ name, skip, err := downloadEntryName(hdr)
+ if err != ErrUnsupportedEntry || skip || name != "" {
+ t.Fatalf("%s = (%q, %v, %v), want bare ErrUnsupportedEntry", hdr.Name, name, skip, err)
+ }
+ }
+}
+
+func TestDownloadEntryNameSanitizesRegularFiles(t *testing.T) {
+ for _, typ := range []byte{tar.TypeReg, tar.TypeRegA} {
+ name, skip, err := downloadEntryName(&tar.Header{Name: "./assets/app.js", Typeflag: typ})
+ if err != nil || skip || name != "assets/app.js" {
+ t.Fatalf("type %v = (%q, %v, %v), want assets/app.js", typ, name, skip, err)
+ }
+ }
+ if _, _, err := downloadEntryName(&tar.Header{Name: "../escape.js", Typeflag: tar.TypeReg}); err == nil {
+ t.Fatal("escaping member name was accepted")
+ }
+}
+
+func TestCopyDownloadMemberWritesDeflatedMember(t *testing.T) {
+ modified := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
+ var out bytes.Buffer
+ zw := zip.NewWriter(&out)
+ body := "body{color:red}"
+ hdr := &tar.Header{Name: "assets/app.css", Size: int64(len(body)), ModTime: modified}
+ if err := copyDownloadMember(context.Background(), zw, strings.NewReader(body), "assets/app.css", hdr); err != nil {
+ t.Fatal(err)
+ }
+ if err := zw.Close(); err != nil {
+ t.Fatal(err)
+ }
+ zr, err := zip.NewReader(bytes.NewReader(out.Bytes()), int64(out.Len()))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if len(zr.File) != 1 {
+ t.Fatalf("ZIP files = %d, want 1", len(zr.File))
+ }
+ file := zr.File[0]
+ if file.Name != "assets/app.css" || file.Method != zip.Deflate || file.Mode().Perm() != 0o644 || !file.Modified.Equal(modified) {
+ t.Fatalf("header = name %q method %d mode %v modified %v", file.Name, file.Method, file.Mode(), file.Modified)
+ }
+ r, err := file.Open()
+ if err != nil {
+ t.Fatal(err)
+ }
+ got, err := io.ReadAll(r)
+ _ = r.Close()
+ if err != nil || string(got) != body {
+ t.Fatalf("content = %q, %v", got, err)
+ }
+}
+
+func TestCopyDownloadMemberRejectsSizeMismatch(t *testing.T) {
+ zw := zip.NewWriter(io.Discard)
+ hdr := &tar.Header{Name: "index.html", Size: 10}
+ err := copyDownloadMember(context.Background(), zw, strings.NewReader("short"), "index.html", hdr)
+ if err == nil || err.Error() != `preview file "index.html" size mismatch` {
+ t.Fatalf("err = %v, want size mismatch", err)
+ }
+}
+
+func TestCopyDownloadMemberHonorsCanceledContext(t *testing.T) {
+ ctx, cancel := context.WithCancel(context.Background())
+ cancel()
+ zw := zip.NewWriter(io.Discard)
+ hdr := &tar.Header{Name: "index.html", Size: 2}
+ if err := copyDownloadMember(ctx, zw, strings.NewReader("ok"), "index.html", hdr); !errors.Is(err, context.Canceled) {
+ t.Fatalf("err = %v, want context.Canceled", err)
+ }
+}