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/batch: prevent host execution through Git config by cbrnrd · Pull Request #1368 · sourcegraph/src-cli

Conversation

@cbrnrd

@cbrnrd cbrnrd commented Sep 3, 2026 •
edited
Loading

Uh oh!

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

Copy link
Copy Markdown
Contributor

Problem

Batch steps run repository code inside a Docker container, but bind workspaces also expose the repository's .git directory to that container. A step can change .git/config and add an external diff command or Git filter. After the step finishes, src-cli runs git add and git diff on the host. Those commands can read the changed configuration and run the repository-provided command outside the container with the permissions of src-cli.

Solution

Save the trusted Git control files before repository code runs and restore them before host-side Git operations. This prevents a container step from changing the configuration used by host Git. The diff command also uses --no-ext-diff as an additional safeguard. The restore supports normal repositories and linked worktrees, and rejects unsafe Git metadata replacements.

This differs from the recent archive and Git hook fixes. Those changes reject Git metadata supplied during workspace creation and disable hooks. This change protects Git configuration modified later by a running container step, including external diff commands and clean filters that do not use hooks.

Verification Evidence

  • Added a regression test that injects an external diff command and a clean filter into .git/config. The diff succeeds without running either command, and the trusted config is restored.
  • go test ./...
  • go vet ./internal/batches/workspace ./internal/batches/executor
  • Windows amd64 cross-compilation of the workspace tests

Sorry, something went wrong.

Uh oh!

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

All reactions
@cbrnrd
fix/batch: prevent host execution through Git config
1c0d242
@cbrnrd
cbrnrd requested a review from a team September 3, 2026 18:33
@cbrnrd
cbrnrd marked this pull request as ready for review September 3, 2026 18:33
@cbrnrd
cbrnrd enabled auto-merge (squash) September 3, 2026 18:33
BolajiOlajide
BolajiOlajide approved these changes Sep 3, 2026
View reviewed changes
@cbrnrd
cbrnrd merged commit e270bbe into main Sep 3, 2026
8 checks passed

Uh oh!

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

@cbrnrd
cbrnrd deleted the h1-3975194-fix branch September 3, 2026 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@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.

2 participants

@cbrnrd @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.