Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

fix: remove probe folders after the bwrap check

Samrat Talukdar076d37d86597
diff --git a/apps/desktop/box/go/cmd/boxrun/main.go b/apps/desktop/box/go/cmd/boxrun/main.go
index 655f1b70..d6eea7d5 100644
--- a/apps/desktop/box/go/cmd/boxrun/main.go
+++ b/apps/desktop/box/go/cmd/boxrun/main.go
@@ -29,6 +29,7 @@ import (
"errors"
"flag"
"fmt"
+ "io/fs"
"net"
"os"
"os/exec"
@@ -1069,9 +1070,13 @@ func rmtreeInner(args []string) error {
}
func removeTree(p string) error {
- _ = filepath.Walk(p, func(q string, fi os.FileInfo, err error) error {
- if err == nil && fi.IsDir() && fi.Mode().Perm()&0o700 != 0o700 {
- _ = os.Chmod(q, fi.Mode().Perm()|0o700)
+ // WalkDir calls back before it reads a folder, so an unreadable one (overlayfs leaves
+ // work/work as d---------) is made readable first and its contents are reached too.
+ _ = filepath.WalkDir(p, func(q string, d fs.DirEntry, err error) error {
+ if d != nil && d.IsDir() {
+ if info, e := d.Info(); e == nil && info.Mode().Perm()&0o700 != 0o700 {
+ _ = os.Chmod(q, info.Mode().Perm()|0o700)
+ }
}
return nil
})
diff --git a/apps/desktop/box/go/cmd/boxrun/main_test.go b/apps/desktop/box/go/cmd/boxrun/main_test.go
index c3f8a6f9..ccff5fca 100644
--- a/apps/desktop/box/go/cmd/boxrun/main_test.go
+++ b/apps/desktop/box/go/cmd/boxrun/main_test.go
@@ -88,3 +88,25 @@ func TestAlive(t *testing.T) {
t.Fatal("a pid that is not bwrap/unshare/boxrun counted as the box")
}
}
+
+func TestRemoveTreeUnreadableFolders(t *testing.T) {
+ root := filepath.Join(t.TempDir(), "probe")
+ deep := filepath.Join(root, "work", "work", "inner")
+ if err := os.MkdirAll(deep, 0o755); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.WriteFile(filepath.Join(deep, "f"), []byte("x"), 0o644); err != nil {
+ t.Fatal(err)
+ }
+ for _, dir := range []string{deep, filepath.Join(root, "work", "work")} {
+ if err := os.Chmod(dir, 0); err != nil {
+ t.Fatal(err)
+ }
+ }
+ if err := removeTree(root); err != nil {
+ t.Fatalf("removeTree: %v", err)
+ }
+ if _, err := os.Stat(root); !os.IsNotExist(err) {
+ t.Fatalf("%s is still there: %v", root, err)
+ }
+}