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.

【架构优化】从 dockerAgentConfigMasks 中拆出工作区挂载目标准备 ensureDockerMaskTargets (#742)

fx-kurumiacadf85140b2
diff --git a/internal/runtime/sandbox_mask_targets_guard_test.go b/internal/runtime/sandbox_mask_targets_guard_test.go
new file mode 100644
index 00000000..4a4a7975
--- /dev/null
+++ b/internal/runtime/sandbox_mask_targets_guard_test.go
@@ -0,0 +1,62 @@
+package runtime
+
+import (
+ "os"
+ "path/filepath"
+ "strings"
+ "testing"
+)
+
+// A symlinked empty-file target must be rejected even when it points to a
+// regular file inside the workspace: Docker would bind the mask over the link
+// target instead of the placeholder, so the link target must stay untouched.
+func TestEnsureDockerMaskTargetsRejectsSymlinkedFile(t *testing.T) {
+ workspace := t.TempDir()
+ isolation, err := EnsureControlDirectory(workspace, "isolation")
+ if err != nil {
+ t.Fatal(err)
+ }
+ real := filepath.Join(isolation, "real-file")
+ if err := os.WriteFile(real, nil, 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.Symlink(real, filepath.Join(isolation, "empty-file")); err != nil {
+ t.Fatal(err)
+ }
+ err = ensureDockerMaskTargets(workspace)
+ if err == nil || !strings.Contains(err.Error(), "workspace path is a symlink") {
+ t.Fatalf("ensureDockerMaskTargets() error = %v, want symlink error", err)
+ }
+ if info, err := os.Lstat(filepath.Join(isolation, "empty-file")); err != nil || info.Mode()&os.ModeSymlink == 0 {
+ t.Fatalf("symlinked target was replaced: %v, %v", info, err)
+ }
+}
+
+// The empty-dir target must be a directory; a regular file in its place is an
+// error rather than silently skipped.
+func TestEnsureDockerMaskTargetsRejectsFileAsEmptyDir(t *testing.T) {
+ workspace := t.TempDir()
+ isolation, err := EnsureControlDirectory(workspace, "isolation")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if err := os.WriteFile(filepath.Join(isolation, "empty-dir"), nil, 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if err := ensureDockerMaskTargets(workspace); err == nil {
+ t.Fatal("ensureDockerMaskTargets accepted a regular file as the empty-dir target")
+ }
+}
+
+// dockerAgentConfigMasks must stop on a broken mount target instead of
+// returning masks Docker cannot mount.
+func TestDockerAgentConfigMasksPropagatesTargetError(t *testing.T) {
+ workspace := t.TempDir()
+ if _, err := EnsureControlDirectory(workspace, "isolation", "empty-file"); err != nil {
+ t.Fatal(err)
+ }
+ masks, err := dockerAgentConfigMasks(workspace)
+ if err == nil || !strings.Contains(err.Error(), "sandbox mask target is not a regular file") || masks != nil {
+ t.Fatalf("dockerAgentConfigMasks() = %v, %v; want nil masks and non-regular file error", masks, err)
+ }
+}
diff --git a/internal/runtime/sandbox_mask_targets_test.go b/internal/runtime/sandbox_mask_targets_test.go
new file mode 100644
index 00000000..3ab668ff
--- /dev/null
+++ b/internal/runtime/sandbox_mask_targets_test.go
@@ -0,0 +1,56 @@
+package runtime
+
+import (
+ "os"
+ "path/filepath"
+ "strings"
+ "testing"
+)
+
+func TestEnsureDockerMaskTargetsCreatesTargets(t *testing.T) {
+ workspace := t.TempDir()
+ for i := 0; i < 2; i++ {
+ if err := ensureDockerMaskTargets(workspace); err != nil {
+ t.Fatalf("call %d: %v", i+1, err)
+ }
+ }
+ dir, err := os.Lstat(filepath.Join(workspace, ".agentflow", "isolation", "empty-dir"))
+ if err != nil || !dir.IsDir() {
+ t.Fatalf("empty-dir target: %v, %v", dir, err)
+ }
+ file, err := os.Lstat(filepath.Join(workspace, ".agentflow", "isolation", "empty-file"))
+ if err != nil || !file.Mode().IsRegular() {
+ t.Fatalf("empty-file target: %v, %v", file, err)
+ }
+ if file.Mode().Perm() != 0o600 {
+ t.Fatalf("empty-file mode = %v, want 0600", file.Mode().Perm())
+ }
+}
+
+func TestEnsureDockerMaskTargetsKeepsExistingFile(t *testing.T) {
+ workspace := t.TempDir()
+ if err := ensureDockerMaskTargets(workspace); err != nil {
+ t.Fatal(err)
+ }
+ target := filepath.Join(workspace, ".agentflow", "isolation", "empty-file")
+ if err := os.WriteFile(target, []byte("kept"), 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if err := ensureDockerMaskTargets(workspace); err != nil {
+ t.Fatal(err)
+ }
+ if data, err := os.ReadFile(target); err != nil || string(data) != "kept" {
+ t.Fatalf("existing empty-file was rewritten: %q, %v", data, err)
+ }
+}
+
+func TestEnsureDockerMaskTargetsRejectsNonRegularFile(t *testing.T) {
+ workspace := t.TempDir()
+ if _, err := EnsureControlDirectory(workspace, "isolation", "empty-file"); err != nil {
+ t.Fatal(err)
+ }
+ err := ensureDockerMaskTargets(workspace)
+ if err == nil || !strings.Contains(err.Error(), "sandbox mask target is not a regular file") {
+ t.Fatalf("ensureDockerMaskTargets() error = %v, want non-regular file error", err)
+ }
+}
diff --git a/internal/runtime/sandbox_process.go b/internal/runtime/sandbox_process.go
index b623e97c..eebb9131 100644
--- a/internal/runtime/sandbox_process.go
+++ b/internal/runtime/sandbox_process.go
@@ -534,34 +534,40 @@ func dockerIsolationMaskRoot(workspace string) string {
return filepath.Join(filepath.Dir(workspace), ".isolation-masks", filepath.Base(workspace))
}
-func dockerAgentConfigMasks(workspace string, aliases ...string) ([]string, error) {
- // Docker Desktop cannot create missing nested mount targets on a VirtioFS share.
+// ensureDockerMaskTargets creates the in-workspace mount targets for the
+// isolation mask sources: Docker Desktop cannot create missing nested mount
+// targets on a VirtioFS share.
+func ensureDockerMaskTargets(workspace string) error {
if _, err := EnsureControlDirectory(workspace, "isolation", "empty-dir"); err != nil {
- return nil, err
+ return err
}
target := filepath.Join(workspace, ".agentflow", "isolation", "empty-file")
root, rel, err := openWorkspacePath(workspace, target)
if err != nil {
- return nil, err
+ return err
}
defer root.Close()
file, err := root.OpenFile(rel, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0o600)
if err == nil {
- if err := file.Close(); err != nil {
- return nil, err
- }
- } else if os.IsExist(err) {
- info, err := root.Lstat(rel)
- if err != nil {
- return nil, err
- }
- if !info.Mode().IsRegular() {
- return nil, fmt.Errorf("sandbox mask target is not a regular file: %s", target)
- }
- } else {
- return nil, err
+ return file.Close()
}
+ if !os.IsExist(err) {
+ return err
+ }
+ info, err := root.Lstat(rel)
+ if err != nil {
+ return err
+ }
+ if !info.Mode().IsRegular() {
+ return fmt.Errorf("sandbox mask target is not a regular file: %s", target)
+ }
+ return nil
+}
+func dockerAgentConfigMasks(workspace string, aliases ...string) ([]string, error) {
+ if err := ensureDockerMaskTargets(workspace); err != nil {
+ return nil, err
+ }
emptyDir, emptyFile, err := isolationMaskSourcesAt(dockerIsolationMaskRoot(workspace))
if err != nil {
return nil, err