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.

refactor(runtime): split path validation and create branch out of WriteWorkspaceFile (#435)

fx-kurumie2495cf99b76
diff --git a/internal/runtime/workspace_edit.go b/internal/runtime/workspace_edit.go
index 47ec941a..3cb1e90f 100644
--- a/internal/runtime/workspace_edit.go
+++ b/internal/runtime/workspace_edit.go
@@ -21,26 +21,9 @@ func WriteWorkspaceFile(root, path, content, expected string) (string, error) {
if len(content) > 1<<20 || !utf8.ValidString(content) || strings.ContainsRune(content, 0) {
return "", fmt.Errorf("只支持 1 MB 以内的文本文件")
}
- rel := filepath.Clean(filepath.FromSlash(path))
- if rel == "." || filepath.IsAbs(rel) || rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
- return "", fmt.Errorf("invalid workspace path")
- }
- for _, part := range strings.Split(filepath.ToSlash(rel), "/") {
- if strings.HasPrefix(part, ".") {
- return "", fmt.Errorf("隐藏文件不可编辑")
- }
- }
- for current := rel; current != "."; current = filepath.Dir(current) {
- info, err := os.Lstat(filepath.Join(root, current))
- if os.IsNotExist(err) && current == rel && expected == "missing" {
- continue
- }
- if err != nil {
- return "", err
- }
- if info.Mode()&os.ModeSymlink != 0 {
- return "", fmt.Errorf("符号链接不可编辑")
- }
+ rel, err := resolveWorkspaceEditPath(root, path, expected)
+ if err != nil {
+ return "", err
}
base, err := os.OpenRoot(root)
if err != nil {
@@ -49,20 +32,7 @@ func WriteWorkspaceFile(root, path, content, expected string) (string, error) {
defer base.Close()
info, err := base.Stat(rel)
if os.IsNotExist(err) && expected == "missing" {
- f, err := base.OpenFile(rel, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0644)
- if err != nil {
- return "", err
- }
- _, err = f.WriteString(content)
- if err == nil {
- err = f.Sync()
- }
- closeErr := f.Close()
- if err == nil {
- err = closeErr
- }
- if err != nil {
- base.Remove(rel)
+ if err := createWorkspaceFile(base, rel, content); err != nil {
return "", err
}
return WorkspaceContentSHA(content), nil
@@ -111,3 +81,53 @@ func WriteWorkspaceFile(root, path, content, expected string) (string, error) {
}
return WorkspaceContentSHA(content), nil
}
+
+// resolveWorkspaceEditPath cleans path into a workspace-relative path and rejects
+// absolute or escaping paths, hidden components, and any symlink component. With
+// expected == "missing" only the final component may be absent.
+func resolveWorkspaceEditPath(root, path, expected string) (string, error) {
+ rel := filepath.Clean(filepath.FromSlash(path))
+ if rel == "." || filepath.IsAbs(rel) || rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
+ return "", fmt.Errorf("invalid workspace path")
+ }
+ for _, part := range strings.Split(filepath.ToSlash(rel), "/") {
+ if strings.HasPrefix(part, ".") {
+ return "", fmt.Errorf("隐藏文件不可编辑")
+ }
+ }
+ for current := rel; current != "."; current = filepath.Dir(current) {
+ info, err := os.Lstat(filepath.Join(root, current))
+ if os.IsNotExist(err) && current == rel && expected == "missing" {
+ continue
+ }
+ if err != nil {
+ return "", err
+ }
+ if info.Mode()&os.ModeSymlink != 0 {
+ return "", fmt.Errorf("符号链接不可编辑")
+ }
+ }
+ return rel, nil
+}
+
+// createWorkspaceFile writes content to a new file that must not exist yet,
+// removing the partial file when the write fails.
+func createWorkspaceFile(base *os.Root, rel, content string) error {
+ f, err := base.OpenFile(rel, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0644)
+ if err != nil {
+ return err
+ }
+ _, err = f.WriteString(content)
+ if err == nil {
+ err = f.Sync()
+ }
+ closeErr := f.Close()
+ if err == nil {
+ err = closeErr
+ }
+ if err != nil {
+ base.Remove(rel)
+ return err
+ }
+ return nil
+}
diff --git a/internal/runtime/workspace_edit_split_test.go b/internal/runtime/workspace_edit_split_test.go
new file mode 100644
index 00000000..a695b98d
--- /dev/null
+++ b/internal/runtime/workspace_edit_split_test.go
@@ -0,0 +1,69 @@
+package runtime
+
+import (
+ "os"
+ "path/filepath"
+ "testing"
+)
+
+func TestResolveWorkspaceEditPath(t *testing.T) {
+ root := t.TempDir()
+ if err := os.MkdirAll(filepath.Join(root, "src"), 0755); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.WriteFile(filepath.Join(root, "src", "main.go"), []byte("x"), 0644); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.Symlink(t.TempDir(), filepath.Join(root, "link")); err != nil {
+ t.Fatal(err)
+ }
+ cases := []struct {
+ path, expected, want string
+ ok bool
+ }{
+ {"src/main.go", "sha", filepath.Join("src", "main.go"), true},
+ {"src/./main.go", "sha", filepath.Join("src", "main.go"), true},
+ {"src/new.go", "missing", filepath.Join("src", "new.go"), true},
+ {"src/new.go", "sha", "", false},
+ {"absent/new.go", "missing", "", false},
+ {".", "missing", "", false},
+ {"..", "missing", "", false},
+ {"../escape", "missing", "", false},
+ {"/etc/passwd", "sha", "", false},
+ {".env", "missing", "", false},
+ {"src/.git/config", "missing", "", false},
+ {"link", "sha", "", false},
+ {"link/file", "missing", "", false},
+ }
+ for _, c := range cases {
+ got, err := resolveWorkspaceEditPath(root, c.path, c.expected)
+ if c.ok && (err != nil || got != c.want) {
+ t.Fatalf("%q/%q: got %q, %v; want %q", c.path, c.expected, got, err, c.want)
+ }
+ if !c.ok && err == nil {
+ t.Fatalf("%q/%q: accepted as %q", c.path, c.expected, got)
+ }
+ }
+}
+
+func TestCreateWorkspaceFile(t *testing.T) {
+ root := t.TempDir()
+ base, err := os.OpenRoot(root)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer base.Close()
+ if err = createWorkspaceFile(base, "new.txt", "hello"); err != nil {
+ t.Fatal(err)
+ }
+ raw, err := os.ReadFile(filepath.Join(root, "new.txt"))
+ if err != nil || string(raw) != "hello" {
+ t.Fatalf("content %q, %v", raw, err)
+ }
+ if err = createWorkspaceFile(base, "new.txt", "overwrite"); err == nil {
+ t.Fatal("existing file overwritten")
+ }
+ if raw, _ = os.ReadFile(filepath.Join(root, "new.txt")); string(raw) != "hello" {
+ t.Fatalf("existing file changed: %q", raw)
+ }
+}