fix/batches: prevent Git commondir config bypass - #1371
Merged
cbrnrd merged 1 commit intoSep 9, 2026
Merged
Conversation
cbrnrd
marked this pull request as ready for review
September 8, 2026 14:38
DaedalusG
approved these changes
Sep 8, 2026
BolajiOlajide
approved these changes
Sep 9, 2026
Contributor
Author
cbrnrd
force-pushed
the
carterbrainerd-vuln-153-gitcommondir-bypasses-git-config-restoration-and-achieves
branch
from
September 9, 2026 13:27
42849c6 to
e0faaad
Compare
cbrnrd
deleted the
carterbrainerd-vuln-153-gitcommondir-bypasses-git-config-restoration-and-achieves
branch
September 9, 2026 13:33
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Problem
A batch container can create a
.git/commondirfile that points Git to an attacker-controlled directory. The existing metadata restoration only restores.git/configand.git/config.worktree, so host-side Git commands can still read malicious configuration from the redirected directory. A malicious clean filter can then run code on the host outside the container.This fixes VULN-153.
Solution
Snapshot
.git/commondirwith the other trusted Git control files and restore it before every host-side Git command. If the original repository did not have acommondirfile, an injected file is removed before Git runs.The regression test creates an attacker-controlled common directory with a malicious clean filter and verifies that diff generation uses the trusted Git configuration instead.
Verification Evidence
go test ./internal/batches/workspace -count=1go test ./internal/batches/...git diff --check