Skip to content

Fix: Git Server Path Restriction #2757

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
cliffhall merged 3 commits into from
Sep 24, 2025
Merged

Fix: Git Server Path Restriction #2757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eac56e7
refactor: remove redundant initialization functionality
0dd Sep 24, 2025
6382f78
docs: update README to reflect removed initialization functionality
0dd Sep 24, 2025
c519dbb
Merge branch 'main' into security/git-server-optimization
cliffhall Sep 24, 2025
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
7 changes: 1 addition & 6 deletions src/git/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,8 @@ Please note that mcp-server-git is currently in early development. The functiona
- `repo_path` (string): Path to Git repository
- `revision` (string): The revision (commit hash, branch name, tag) to show
- Returns: Contents of the specified commit
12. `git_init`
Copy link
Contributor Author

@0dd 0dd Sep 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reason: https://docs.google.com/document/d/1zzx1rzdFa3ZjYFKbpfFiCcA9uloNWc0JzQARoSxyHws/edit?disco=AAABr3YMuU8

- Initializes a Git repository
- Inputs:
- `repo_path` (string): Path to directory to initialize git repo
- Returns: Confirmation of repository initialization

13. `git_branch`
12. `git_branch`
- List Git branches
- Inputs:
- `repo_path` (string): Path to the Git repository.
Expand Down
28 changes: 5 additions & 23 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 @@ -70,8 +70,7 @@ class GitShow(BaseModel):
repo_path: str
revision: str

class GitInit(BaseModel):
repo_path: str


class GitBranch(BaseModel):
repo_path: str = Field(
Expand Down Expand Up @@ -104,7 +103,7 @@ class GitTools(str, Enum):
CREATE_BRANCH = "git_create_branch"
CHECKOUT = "git_checkout"
SHOW = "git_show"
INIT = "git_init"

BRANCH = "git_branch"

def git_status(repo: git.Repo) -> str:
Expand Down Expand Up @@ -183,12 +182,7 @@ def git_checkout(repo: git.Repo, branch_name: str) -> str:
repo.git.checkout(branch_name)
return f"Switched to branch '{branch_name}'"

def git_init(repo_path: str) -> str:
try:
repo = git.Repo.init(path=repo_path, mkdir=True)
return f"Initialized empty Git repository in {repo.git_dir}"
except Exception as e:
return f"Error initializing repository: {str(e)}"


def git_show(repo: git.Repo, revision: str) -> str:
commit = repo.commit(revision)
Expand Down Expand Up @@ -308,11 +302,7 @@ async def list_tools() -> list[Tool]:
description="Shows the contents of a commit",
inputSchema=GitShow.model_json_schema(),
),
Tool(
name=GitTools.INIT,
description="Initialize a new Git repository",
inputSchema=GitInit.model_json_schema(),
),

Tool(
name=GitTools.BRANCH,
description="List Git branches",
Expand Down Expand Up @@ -354,15 +344,7 @@ def by_commandline() -> Sequence[str]:
async def call_tool(name: str, arguments: dict) -> list[TextContent]:
repo_path = Path(arguments["repo_path"])

# Handle git init separately since it doesn't require an existing repo
if name == GitTools.INIT:
result = git_init(str(repo_path))
return [TextContent(
type="text",
text=result
)]

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

match name:
Expand Down