Skip to content

fix(ng-dev): prevent shell command injection in git push command #3735

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
alan-agius4 merged 1 commit into from
Jun 5, 2026
Merged

fix(ng-dev): prevent shell command injection in git push command #3735

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion ng-dev/pr/common/checkout-pr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ export async function checkOutPullRequestLocally(
// https://git-scm.com/docs/git-push#Documentation/git-push.txt---force-with-leaseltrefnamegtltexpectgt
/** Flag for a force push with lease back to upstream. */
const forceWithLeaseFlag = `--force-with-lease=${headRefName}:${pr.headRefOid}`;
const escapedHeadRefName = `'${headRefName.replace(/'/g, "'\\''")}'`;
const escapedForceWithLeaseFlag = `--force-with-lease=${escapedHeadRefName}:${pr.headRefOid}`;
Comment thread
josephperrott marked this conversation as resolved.

// If the PR does not allow maintainers to modify it, exit as the rebased PR cannot
// be pushed up.
Expand Down Expand Up @@ -130,7 +132,7 @@ export async function checkOutPullRequestLocally(
resetGitState: (): boolean => {
return git.checkout(previousBranchOrRevision, true);
},
pushToUpstreamCommand: `git push ${upstreamUrlToPush(pr.headRef.repository.url)} HEAD:${headRefName} ${forceWithLeaseFlag}`,
pushToUpstreamCommand: `git push ${upstreamUrlToPush(pr.headRef.repository.url)} HEAD:${escapedHeadRefName} ${escapedForceWithLeaseFlag}`,
Comment thread
josephperrott marked this conversation as resolved.
resetGitStateCommand: `git rebase --abort && git reset --hard && git checkout ${previousBranchOrRevision}`,
pullRequest: pr,
};
Expand Down
6 changes: 5 additions & 1 deletion ng-dev/pr/rebase/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export async function rebasePr(prNumber: number, interactive: boolean = false):
// See:
// https://git-scm.com/docs/git-push#Documentation/git-push.txt---force-with-leaseltrefnamegtltexpectgt
const forceWithLeaseFlag = `--force-with-lease=${headRefName}:${pr.headRefOid}`;
const escapedHeadRefName = `'${headRefName.replace(/'/g, "'\\''")}'`;
const escapedForceWithLeaseFlag = `--force-with-lease=${escapedHeadRefName}:${pr.headRefOid}`;
Comment thread
josephperrott marked this conversation as resolved.

// If the PR does not allow maintainers to modify it, exit as the rebased PR cannot
// be pushed up.
Expand Down Expand Up @@ -143,7 +145,9 @@ export async function rebasePr(prNumber: number, interactive: boolean = false):
Log.info(
`After manually completing rebase, run the following command to update PR #${prNumber}:`,
);
Log.info(` $ git push ${pr.headRef.repository.url} HEAD:${headRefName} ${forceWithLeaseFlag}`);
Log.info(
` $ git push ${pr.headRef.repository.url} HEAD:${escapedHeadRefName} ${escapedForceWithLeaseFlag}`,
);
Comment thread
josephperrott marked this conversation as resolved.
Log.info();
Log.info(`To abort the rebase and return to the state of the repository before this command`);
Log.info(`run the following command:`);
Expand Down
Loading