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
【架构优化】合并 preview/archive.go 中四处重复的展开大小上限判断为 checkExpandedSize (#569)
fx-kurumi3fea73a6d55c
diff --git a/internal/preview/archive.go b/internal/preview/archive.goindex a059b51e..bd2b088b 100644--- a/internal/preview/archive.go+++ b/internal/preview/archive.go@@ -140,12 +140,12 @@ func collectRegularFiles(workspace, root string, limits Limits) ([]fileEntry, inif !info.Mode().IsRegular() {return fmt.Errorf("%w: %s", ErrUnsupportedEntry, rel)}- if limits.MaxFiles > 0 && len(entries)+1 > limits.MaxFiles {- return fmt.Errorf("%w: more than %d files", ErrLimitExceeded, limits.MaxFiles)+ if err := checkTarFileCount(len(entries)+1, limits); err != nil {+ return err}expanded += info.Size()- if limits.MaxExpanded > 0 && expanded > limits.MaxExpanded {- return fmt.Errorf("%w: expanded size", ErrLimitExceeded)+ if err := checkExpandedSize(expanded, limits); err != nil {+ return err}if _, err := filepath.Rel(workspace, abs); err != nil {return fmt.Errorf("%w: %s", ErrUnsafePath, rel)@@ -277,8 +277,8 @@ func InspectTarZst(src io.Reader, indexFile string, limits Limits) (Result, erroreturn Result{}, err}expanded += hdr.Size- if limits.MaxExpanded > 0 && expanded > limits.MaxExpanded {- return Result{}, fmt.Errorf("%w: expanded size", ErrLimitExceeded)+ if err := checkExpandedSize(expanded, limits); err != nil {+ return Result{}, err}copied, err := io.Copy(io.Discard, io.LimitReader(tr, hdr.Size+1))if err != nil {@@ -350,8 +350,8 @@ func ExtractTarZst(src io.Reader, dest string, limits Limits) error {return err}expanded += hdr.Size- if limits.MaxExpanded > 0 && expanded > limits.MaxExpanded {- return fmt.Errorf("%w: expanded size", ErrLimitExceeded)+ 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 {@@ -407,6 +407,15 @@ func checkTarFileCount(files int, limits Limits) error {return nil}+// checkExpandedSize enforces limits.MaxExpanded (0 means unlimited) against the+// uncompressed byte total seen so far.+func checkExpandedSize(expanded int64, limits Limits) error {+ if limits.MaxExpanded > 0 && expanded > limits.MaxExpanded {+ return fmt.Errorf("%w: expanded size", ErrLimitExceeded)+ }+ return nil+}+// ReadTarZstMember extracts one regular file from a compressed archive into// memory. The rest of the tree is never written to disk.func ReadTarZstMember(src io.Reader, name string, limits Limits) ([]byte, error) {@@ -446,8 +455,8 @@ func ReadTarZstMember(src io.Reader, name string, limits Limits) ([]byte, error)}continue}- if limits.MaxExpanded > 0 && hdr.Size > limits.MaxExpanded {- return nil, fmt.Errorf("%w: expanded size", ErrLimitExceeded)+ if err := checkExpandedSize(hdr.Size, limits); err != nil {+ return nil, err}body, err := io.ReadAll(io.LimitReader(tr, hdr.Size+1))if err != nil {diff --git a/internal/preview/archive_tarzst_test.go b/internal/preview/archive_tarzst_test.goindex 3643d240..8096d1e5 100644--- a/internal/preview/archive_tarzst_test.go+++ b/internal/preview/archive_tarzst_test.go@@ -7,6 +7,7 @@ import ("errors""os""path/filepath"+ "strings""testing")@@ -62,3 +63,24 @@ func TestWriteTarZstPropagatesMissingSourceFile(t *testing.T) {t.Fatal("expected error for missing source file")}}++func TestInspectTarZstEnforcesExpandedLimit(t *testing.T) {+ entries := tarZstTestEntries(t)+ var total int64+ for _, entry := range entries {+ total += entry.size+ }+ var buf bytes.Buffer+ if _, _, err := writeTarZst(&buf, entries, 0); err != nil {+ t.Fatal(err)+ }+ limits := Limits{MaxFiles: 10, MaxCompressed: 1 << 20, MaxExpanded: total}+ if _, err := InspectTarZst(bytes.NewReader(buf.Bytes()), "index.html", limits); err != nil {+ t.Fatalf("expanded size equal to limit must pass: %v", err)+ }+ limits.MaxExpanded = total - 1+ _, err := InspectTarZst(bytes.NewReader(buf.Bytes()), "index.html", limits)+ if !errors.Is(err, ErrLimitExceeded) || !strings.Contains(err.Error(), "expanded size") {+ t.Fatalf("expected expanded size ErrLimitExceeded, got %v", err)+ }+}diff --git a/internal/preview/tar_member_test.go b/internal/preview/tar_member_test.goindex ad1c19c8..34de7dac 100644--- a/internal/preview/tar_member_test.go+++ b/internal/preview/tar_member_test.go@@ -51,3 +51,17 @@ func TestCheckTarFileCount(t *testing.T) {t.Fatalf("over limit err = %v", err)}}++func TestCheckExpandedSize(t *testing.T) {+ t.Parallel()+ if err := checkExpandedSize(1<<40, Limits{}); err != nil {+ t.Fatalf("zero MaxExpanded must mean unlimited: %v", err)+ }+ if err := checkExpandedSize(10, Limits{MaxExpanded: 10}); err != nil {+ t.Fatalf("size equal to limit must pass: %v", err)+ }+ err := checkExpandedSize(11, Limits{MaxExpanded: 10})+ if !errors.Is(err, ErrLimitExceeded) || err.Error() != ErrLimitExceeded.Error()+": expanded size" {+ t.Fatalf("over limit err = %v", err)+ }+}