Skip to content

fix(git): validate repo_path against current roots on every tool call #3631

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

Open
ctonneslan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(git): validate repo_path against current roots on every tool call #3631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions src/git/src/mcp_server_git/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,21 @@ def by_commandline() -> Sequence[str]:
async def call_tool(name: str, arguments: dict) -> list[TextContent]:
repo_path = Path(arguments["repo_path"])

# Validate repo_path is within allowed repository
validate_repo_path(repo_path, repository)
# Validate repo_path against both CLI repository AND current roots.
# This ensures root changes at runtime revoke access to removed repos.
allowed_repos = await list_repos()
if allowed_repos:
resolved_repo = str(repo_path.resolve())
if not any(
resolved_repo == r or resolved_repo.startswith(r + "/")
for r in (str(Path(r).resolve()) for r in allowed_repos)
):
raise ValueError(
f"Repository path '{repo_path}' is not within any allowed repository"
)
elif repository is not None:
# Fallback to CLI-only validation if list_repos fails
validate_repo_path(repo_path, repository)

# For all commands, we need an existing repo
repo = git.Repo(repo_path)
Expand Down
Loading