GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — fix/batches: prevent Git commondir config bypass by cbrnrd · Pull Request #1371 · sourcegraph/src-cli

Conversation

@cbrnrd

@cbrnrd cbrnrd commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

Problem

A batch container can create a .git/commondir file that points Git to an attacker-controlled directory. The existing metadata restoration only restores .git/config and .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/commondir with the other trusted Git control files and restore it before every host-side Git command. If the original repository did not have a commondir file, 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=1
  • go test ./internal/batches/...
  • git diff --check

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@cbrnrd
cbrnrd marked this pull request as ready for review September 8, 2026 14:38
@cbrnrd
cbrnrd requested a review from a team September 8, 2026 14:39
DaedalusG
DaedalusG approved these changes Sep 8, 2026
View reviewed changes
BolajiOlajide
BolajiOlajide approved these changes Sep 9, 2026
View reviewed changes
@cbrnrd Graphite App

cbrnrd commented Sep 9, 2026 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor Author

Merge activity

  • Sep 9, 1:26 PM UTC: A user started a stack merge that includes this pull request via Graphite.
  • Sep 9, 1:27 PM UTC: Graphite rebased this pull request as part of a merge.
  • Sep 9, 1:33 PM UTC: @cbrnrd merged this pull request with Graphite.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@cbrnrd
fix/batches: prevent Git commondir config bypass
e0faaad
@cbrnrd
cbrnrd force-pushed the carterbrainerd-vuln-153-gitcommondir-bypasses-git-config-restoration-and-achieves branch from 42849c6 to e0faaad Compare September 9, 2026 13:27
@cbrnrd
cbrnrd merged commit 4d07a31 into main Sep 9, 2026
8 checks passed

Uh oh!

There was an error while loading. Please reload this page.

@cbrnrd
cbrnrd deleted the carterbrainerd-vuln-153-gitcommondir-bypasses-git-config-restoration-and-achieves branch September 9, 2026 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DaedalusG DaedalusG DaedalusG approved these changes
@BolajiOlajide BolajiOlajide BolajiOlajide approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

3 participants

@cbrnrd @DaedalusG @BolajiOlajide
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.