Skip to content

fix: validate paths in delete_files with validatePathWithinRepo #1006

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
qinlongli2024-ai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: validate paths in delete_files with validatePathWithinRepo #1006

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
27 changes: 12 additions & 15 deletions src/mcp/github-file-ops-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,21 +479,18 @@ server.tool(
throw new Error("GITHUB_TOKEN environment variable is required");
}

// Convert absolute paths to relative if they match CWD
const cwd = process.cwd();
const processedPaths = paths.map((filePath) => {
if (filePath.startsWith("/")) {
if (filePath.startsWith(cwd)) {
// Strip CWD from absolute path
return filePath.slice(cwd.length + 1);
} else {
throw new Error(
`Path '${filePath}' must be relative to repository root or within current working directory`,
);
}
}
return filePath;
});
// Validate all paths are within the repository root — mirrors
// the validation used in commit_files to prevent path-traversal
// attacks via ".." sequences or symlinks escaping the repo.
const resolvedRepoDir = resolve(REPO_DIR);
const processedPaths = await Promise.all(
paths.map(async (filePath) => {
await validatePathWithinRepo(filePath, REPO_DIR);
// Normalise to a relative path for the Git tree entry
const normalizedPath = resolve(resolvedRepoDir, filePath);
return normalizedPath.slice(resolvedRepoDir.length + 1);
}),
);

// 1. Get the branch reference (create if doesn't exist)
const baseSha = await getOrCreateBranchRef(
Expand Down