-
Notifications
You must be signed in to change notification settings - Fork 123
fix(sandbox): resolve git metadata carveouts for worktrees #805
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jaivial
wants to merge
1
commit into
Gitlawb:main
Choose a base branch
from
jaivial:fix/sandbox-worktree-git-carveout
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package sandbox | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
| ) | ||
|
|
||
| // Worktree/submodule checkouts store .git as a *file* ("gitdir: <path>"). The | ||
| // hooks/config carveout must resolve the real (common) git dir instead of the | ||
| // bogus <root>/.git/hooks under that file — a --tmpfs there makes bwrap fail | ||
| // ("Can't mkdir parents ... Not a directory") and blocks every sandboxed tool. | ||
| func TestGitMetadataWriteCarveoutsResolvesWorktree(t *testing.T) { | ||
| main := t.TempDir() | ||
| commonGit := filepath.Join(main, ".git") | ||
| worktreeGit := filepath.Join(commonGit, "worktrees", "wt") | ||
| if err := os.MkdirAll(worktreeGit, 0o755); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err := os.WriteFile(filepath.Join(worktreeGit, "commondir"), []byte("../..\n"), 0o644); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| worktree := t.TempDir() | ||
| if err := os.WriteFile(filepath.Join(worktree, ".git"), []byte("gitdir: "+worktreeGit+"\n"), 0o644); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| got := gitMetadataWriteCarveouts(worktree) | ||
| want := []string{ | ||
| filepath.Join(commonGit, "hooks"), | ||
| filepath.Join(commonGit, "config"), | ||
| } | ||
| if len(got) != len(want) { | ||
| t.Fatalf("carveouts = %v, want %v", got, want) | ||
| } | ||
| for i := range want { | ||
| if got[i] != want[i] { | ||
| t.Fatalf("carveout[%d] = %q, want %q", i, got[i], want[i]) | ||
| } | ||
| } | ||
| // Must never point under the .git *file* — that path has no mkdir-able parent. | ||
| bogus := filepath.Join(worktree, ".git", "hooks") | ||
| for _, c := range got { | ||
| if c == bogus { | ||
| t.Fatalf("carveout points under .git file: %q", c) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Plain checkouts (.git is a dir) and .git-absent roots keep the literal | ||
| // <root>/.git/{hooks,config} carveouts. | ||
| func TestGitMetadataWriteCarveoutsPlainCheckout(t *testing.T) { | ||
| root := t.TempDir() | ||
| want := []string{ | ||
| filepath.Join(root, ".git", "hooks"), | ||
| filepath.Join(root, ".git", "config"), | ||
| } | ||
| got := gitMetadataWriteCarveouts(root) | ||
| for i := range want { | ||
| if got[i] != want[i] { | ||
| t.Fatalf("carveout[%d] = %q, want %q", i, got[i], want[i]) | ||
| } | ||
| } | ||
|
|
||
| if err := os.MkdirAll(filepath.Join(root, ".git"), 0o755); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| got = gitMetadataWriteCarveouts(root) | ||
| for i := range want { | ||
| if got[i] != want[i] { | ||
| t.Fatalf("dir carveout[%d] = %q, want %q", i, got[i], want[i]) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🩺 Stability & Availability | 🟠 Major | ⚡ Quick win
Return no carveouts when a
.gitfile cannot be resolved.If
resolveGitDirreturns""for a stale, malformed, or unreadable.gitfile, this leavesgitDiras<root>/.gitand returns descendants of that file. That recreates the documented bwrap “Not a directory” failure and blocks sandboxed tools. Keep the literal fallback only when.gitis absent; return no carveouts for an unresolved non-directory.git, with a regression test for a stalegitdir:pointer.Proposed fix
if info, err := os.Stat(gitDir); err == nil && !info.IsDir() { - if real := resolveGitDir(root); real != "" { - gitDir = resolveGitCommonDir(real) + real := resolveGitDir(root) + if real == "" { + return nil } + gitDir = resolveGitCommonDir(real) }📝 Committable suggestion
🤖 Prompt for AI Agents