fix(sandbox): bind parent dir for globstar allow_write on bwrap (#321)

* fix(sandbox): bind parent dir for globstar allow_write on bwrap

Fine-grained per-path mounts under read-only project binds broke pip
install into in-project .venv directories. Always mount the parent tree
for ** write rules instead.

Fixes #315

* test(sandbox): tighten globstar bind assertions and ensure ~/.npm exists for e2e

Strengthen TestBubblewrapAllowWriteGlobstarBindsParentOnly to verify the
parent dir is writably bound and the child path is read-only bound, not
just substring presence. Pre-create ~/.npm in the e2e harness so
bubblewrap --bind-try does not skip the npm cache dir on fresh runners.

* switch pnpm to /tmp in sandbox e2e

* test(sandbox): update glob ** test for parent-bind semantics

Globstar allow_write now binds the parent dir only (e2e740d), so the
test should assert the parent is writably bound and child subdirs are
not individually bound, instead of substring-matching subdir names.

* fix(sandbox): bind correct base dir for in-pattern globstar allow_write

Globstar allow_write previously used extractGlobParentDir, which walks past
the first ** and yields the wrong root for patterns like /a/b/**/d/**/e.
Introduce extractGlobstarWriteBaseDir, which takes the prefix before the
first /**, and use it in processWriteRule. Also dedup the coarse-fallback
parent-bind loop to mirror the read-rule fallback.
This commit is contained in:
Sahil Bansal
2026-06-07 10:03:23 +05:30
committed by GitHub
parent f3e00a7f6e
commit 872c5d663c
4 changed files with 165 additions and 13 deletions
@@ -274,13 +274,9 @@ func TestBubblewrapTranslatorGlobPatterns(t *testing.T) {
},
assert: func(t *testing.T, args []string, err error) {
require.NoError(t, err)
argsStr := argSliceToString(args)
// Should include the base directory
assert.Contains(t, argsStr, tmpDir)
// Should include subdirectories
assert.Contains(t, argsStr, "subdir1")
assert.Contains(t, argsStr, "subdir2")
assertWriteBind(t, args, tmpDir)
assertNoWriteBind(t, args, filepath.Join(tmpDir, "subdir1"))
assertNoWriteBind(t, args, filepath.Join(tmpDir, "subdir2"))
},
},
{
@@ -775,6 +771,42 @@ func TestGlobFallbackThresholdGlobstar(t *testing.T) {
assert.Less(t, len(args), 300, "Coarse-grained fallback should prevent argument explosion")
}
// TestBubblewrapAllowWriteGlobstarBindsParentOnly verifies globstar allow_write rules
// bind the parent tree (e.g. .venv) instead of per-file mounts that break pip in-project venvs.
// See https://github.com/safedep/pmg/issues/315
func TestBubblewrapAllowWriteGlobstarBindsParentOnly(t *testing.T) {
tmpDir := t.TempDir()
venvDir := filepath.Join(tmpDir, ".venv")
binDir := filepath.Join(venvDir, "bin")
require.NoError(t, os.MkdirAll(binDir, 0755))
pythonPath := filepath.Join(binDir, "python")
require.NoError(t, os.Symlink("/usr/bin/python3", pythonPath))
// Populate enough shallow files that old logic would fine-grain bind without hitting fallback.
for i := 0; i < 30; i++ {
path := filepath.Join(venvDir, fmt.Sprintf("file%d.txt", i))
require.NoError(t, os.WriteFile(path, []byte("x"), 0644))
}
config := newDefaultBubblewrapConfig()
translator := newBubblewrapPolicyTranslator(config)
policy := &sandbox.SandboxPolicy{
Name: "test-venv-write",
Filesystem: sandbox.FilesystemPolicy{
AllowRead: []string{tmpDir + "/**"},
AllowWrite: []string{venvDir + "/**"},
},
}
args, err := translator.translate(policy)
require.NoError(t, err)
assertWriteBind(t, args, venvDir)
assertNoWriteBind(t, args, pythonPath)
assertReadBind(t, args, pythonPath)
}
// TestGlobNoFallbackSmallPattern tests that small patterns don't trigger fallback
func TestGlobNoFallbackSmallPattern(t *testing.T) {
tmpDir := t.TempDir()
@@ -905,6 +937,57 @@ func TestExtractParentDir(t *testing.T) {
}
}
func TestExtractGlobstarWriteBaseDir(t *testing.T) {
cases := []struct {
name string
pattern string
expected string
}{
{
name: "suffix globstar (profiles)",
pattern: "/home/user/.venv/**",
expected: "/home/user/.venv",
},
{
name: "in-pattern globstars",
pattern: "/a/b/**/d/**/e",
expected: "/a/b",
},
{
name: "middle globstar with file suffix",
pattern: "/usr/lib/**/*.so",
expected: "/usr/lib",
},
}
for _, tt := range cases {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, tt.expected, extractGlobstarWriteBaseDir(tt.pattern))
})
}
}
func TestBubblewrapGlobstarWriteMultiSegmentBind(t *testing.T) {
tmpDir := t.TempDir()
baseDir := filepath.Join(tmpDir, "a", "b")
require.NoError(t, os.MkdirAll(baseDir, 0755))
pattern := filepath.Join(tmpDir, "a", "b", "**", "d", "**", "e")
config := newDefaultBubblewrapConfig()
translator := newBubblewrapPolicyTranslator(config)
policy := &sandbox.SandboxPolicy{
Name: "test-multi-globstar-write",
Filesystem: sandbox.FilesystemPolicy{
AllowWrite: []string{pattern},
},
}
args, err := translator.translate(policy)
require.NoError(t, err)
assertWriteBind(t, args, baseDir)
}
// Helper function to convert arg slice to string for easier assertion
func argSliceToString(args []string) string {
result := ""
@@ -1054,6 +1137,25 @@ func assertReadBind(t *testing.T, args []string, path string) {
t.Fatalf("expected --ro-bind %q %q, not found in args: %v", path, path, args)
}
func assertWriteBind(t *testing.T, args []string, path string) {
t.Helper()
for i := 0; i+2 < len(args); i++ {
if (args[i] == "--bind" || args[i] == "--bind-try") && args[i+1] == path && args[i+2] == path {
return
}
}
t.Fatalf("expected --bind-try %q %q, not found in args: %v", path, path, args)
}
func assertNoWriteBind(t *testing.T, args []string, path string) {
t.Helper()
for i := 0; i+2 < len(args); i++ {
if (args[i] == "--bind" || args[i] == "--bind-try") && args[i+1] == path && args[i+2] == path {
t.Fatalf("unexpected writable bind at %q in args: %v", path, args)
}
}
}
func assertReadOnlyBindAfterWritableBind(t *testing.T, args []string, readOnlyPath string, writablePath string) {
t.Helper()