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
【架构优化】从 ExtractTarZst 中拆出单个 tar 成员落盘 extractTarMember (#682)
fx-kurumidcfbd81ed4e8
diff --git a/internal/preview/archive.go b/internal/preview/archive.goindex bd2b088b..3604766d 100644--- a/internal/preview/archive.go+++ b/internal/preview/archive.go@@ -353,25 +353,9 @@ func ExtractTarZst(src io.Reader, dest string, limits Limits) error {if err := checkExpandedSize(expanded, limits); err != nil {return err}- full := filepath.Join(tmp, filepath.FromSlash(name))- if err := os.MkdirAll(filepath.Dir(full), 0o755); err != nil {+ if err := extractTarMember(tr, tmp, name, hdr.Size); err != nil {return err}- out, err := os.OpenFile(full, os.O_CREATE|os.O_WRONLY|os.O_EXCL, 0o644)- if err != nil {- return err- }- copied, copyErr := io.Copy(out, io.LimitReader(tr, hdr.Size))- closeErr := out.Close()- if copyErr != nil {- return copyErr- }- if closeErr != nil {- return closeErr- }- if copied != hdr.Size {- return fmt.Errorf("extracted %s size mismatch", name)- }}_ = os.RemoveAll(dest)if err := os.Rename(tmp, dest); err != nil {@@ -380,6 +364,32 @@ func ExtractTarZst(src io.Reader, dest string, limits Limits) error {return nil}+// extractTarMember writes one sanitized regular member of size bytes from r to+// root/name, creating parent directories. The file must not already exist, and+// a short body is reported as a size mismatch.+func extractTarMember(r io.Reader, root, name string, size int64) error {+ full := filepath.Join(root, filepath.FromSlash(name))+ if err := os.MkdirAll(filepath.Dir(full), 0o755); err != nil {+ return err+ }+ out, err := os.OpenFile(full, os.O_CREATE|os.O_WRONLY|os.O_EXCL, 0o644)+ if err != nil {+ return err+ }+ copied, copyErr := io.Copy(out, io.LimitReader(r, size))+ closeErr := out.Close()+ if copyErr != nil {+ return copyErr+ }+ if closeErr != nil {+ return closeErr+ }+ if copied != size {+ return fmt.Errorf("extracted %s size mismatch", name)+ }+ return nil+}+// tarRegularMember validates one entry read from a preview tar. Directories are// reported as skip; anything other than a regular file is rejected with// ErrUnsupportedEntry. For regular files it returns the sanitized member name.diff --git a/internal/preview/extract_member_test.go b/internal/preview/extract_member_test.gonew file mode 100644index 00000000..ef12c002--- /dev/null+++ b/internal/preview/extract_member_test.go@@ -0,0 +1,85 @@+package preview++import (+ "errors"+ "io"+ "io/fs"+ "os"+ "path/filepath"+ "strings"+ "testing"+ "testing/iotest"+)++func TestExtractTarMemberWritesNestedFile(t *testing.T) {+ t.Parallel()+ root := t.TempDir()+ if err := extractTarMember(strings.NewReader("hello, preview!"), root, "assets/js/app.js", 5); err != nil {+ t.Fatalf("extractTarMember: %v", err)+ }+ got, err := os.ReadFile(filepath.Join(root, "assets", "js", "app.js"))+ if err != nil {+ t.Fatalf("read extracted file: %v", err)+ }+ if string(got) != "hello" {+ t.Fatalf("extracted body = %q, want only the declared 5 bytes", got)+ }+}++func TestExtractTarMemberReportsShortBody(t *testing.T) {+ t.Parallel()+ err := extractTarMember(strings.NewReader("abc"), t.TempDir(), "index.html", 10)+ if err == nil || err.Error() != "extracted index.html size mismatch" {+ t.Fatalf("err = %v, want size mismatch", err)+ }+}++func TestExtractTarMemberRefusesExistingFile(t *testing.T) {+ t.Parallel()+ root := t.TempDir()+ if err := os.WriteFile(filepath.Join(root, "index.html"), []byte("old"), 0o644); err != nil {+ t.Fatal(err)+ }+ err := extractTarMember(strings.NewReader("new"), root, "index.html", 3)+ if !errors.Is(err, fs.ErrExist) {+ t.Fatalf("err = %v, want fs.ErrExist", err)+ }+}++func TestExtractTarMemberFailsWhenParentIsFile(t *testing.T) {+ t.Parallel()+ root := t.TempDir()+ // A previous member "assets" was a regular file, so "assets/app.js" cannot+ // get a parent directory and must fail before anything is written.+ if err := os.WriteFile(filepath.Join(root, "assets"), []byte("file"), 0o644); err != nil {+ t.Fatal(err)+ }+ err := extractTarMember(strings.NewReader("body"), root, "assets/app.js", 4)+ if err == nil {+ t.Fatal("extractTarMember succeeded with a regular file as parent directory")+ }+ if strings.Contains(err.Error(), "size mismatch") {+ t.Fatalf("err = %v, want the directory creation error, not a size mismatch", err)+ }+ got, readErr := os.ReadFile(filepath.Join(root, "assets"))+ if readErr != nil || string(got) != "file" {+ t.Fatalf("existing file changed: %q, %v", got, readErr)+ }+}++func TestExtractTarMemberPropagatesReadError(t *testing.T) {+ t.Parallel()+ root := t.TempDir()+ readErr := errors.New("zstd: corrupt input")+ body := io.MultiReader(strings.NewReader("ab"), iotest.ErrReader(readErr))+ err := extractTarMember(body, root, "index.html", 10)+ if !errors.Is(err, readErr) {+ t.Fatalf("err = %v, want the underlying read error instead of a size mismatch", err)+ }+ // The file is created before the copy fails; ExtractTarZst removes the whole+ // temporary root afterwards, so here only the bytes already read remain.+ got, statErr := os.ReadFile(filepath.Join(root, "index.html"))+ if statErr != nil || string(got) != "ab" {+ t.Fatalf("partial file = %q, %v; want the bytes read before the error", got, statErr)+ }+}