Skip to content

chore: git shim: fail-closed secret scan of commit/push diff content (reuse mcp_server::secret_scan) #950

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.

Sign up for GitHub

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

Merged
getappz merged 4 commits into from
Oct 24, 2026
Merged

chore: git shim: fail-closed secret scan of commit/push diff content (reuse mcp_server::secret_scan) #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dbb9c9
feat(git): scan added commit and push lines for secrets
getappz Oct 22, 2026
dc7c081
test(git): keep scan results out of failure diagnostics
getappz Oct 22, 2026
f991b80
fix(git): require remote bases for secret scanning
getappz Oct 22, 2026
ab2e744
fix(git): scan every outgoing commit's patch on push, not the net diff
getappz Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion crates/flare-git-shim/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,9 @@ fn main() {
classify::Disposition::Deny { .. }
| classify::Disposition::Passthrough
| classify::Disposition::SilentExempt => {
if matches!(subcommand.as_str(), "commit" | "push") {
if matches!(subcommand.as_str(), "commit" | "push")
&& agentflare_shim::in_scoped_project(&repo_root, dirs::home_dir().as_deref())
{
match scope_check_outcome(&subcommand) {
ScopeCheckOutcome::Pass => {}
ScopeCheckOutcome::Deny(reason) => {
Expand Down
20 changes: 20 additions & 0 deletions crates/flare-git-shim/tests/shim_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,26 @@ fn read_only_command_passes_through_and_succeeds() {
assert!(out.status.success(), "{out:?}");
}

#[test]
fn untracked_repo_commit_never_runs_scope_or_secret_checks() {
let repo = init_repo();
std::fs::remove_dir(repo.path().join(".agentflare")).unwrap();
let home = tempfile::TempDir::new().unwrap();
let out = Command::new(env!("CARGO_BIN_EXE_git"))
.args(["commit", "--allow-empty", "-m", "untracked"])
.current_dir(repo.path())
.env("CLAUDECODE", "1")
.env("AGENTFLARE_HOME_OVERRIDE", home.path())
.env(
"AGENTFLARE_GIT_SCOPE_CHECK_BIN",
home.path().join("missing-checker"),
)
.env_remove("AGENTFLARE_GIT_BYPASS")
.output()
.unwrap();
assert!(out.status.success(), "{out:?}");
}

#[test]
fn checkout_to_protected_branch_is_denied_and_real_git_never_runs() {
let repo = init_repo();
Expand Down
Loading
Loading