Skip to content

fix(ci): avoid branch-name command injection in image dispatch #8513

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
andrewlock merged 1 commit into from
Apr 27, 2026
Merged

fix(ci): avoid branch-name command injection in image dispatch #8513

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
6 changes: 4 additions & 2 deletions .azure-pipelines/ultimate-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4320,7 +4320,7 @@ stages:
- checkout: none
- template: steps/create-github-app-token.yml
- bash: |
REF=$(Build.SourceBranch)
REF="$(Build.SourceBranch)"
BRANCH_NAME="latest_snapshot"
if [ "$(Build.Reason)" = "PullRequest" ]; then
LABELS=$(curl -s $(CURL_RETRY_FLAGS) \
Expand All @@ -4329,7 +4329,8 @@ stages:
| jq -r '.labels[].name')

if echo "$LABELS" | grep -q "docker_image_artifacts"; then
BRANCH_NAME="$(System.PullRequest.SourceBranch)"
BRANCH_NAME="$PR_SOURCE_BRANCH"
BRANCH_NAME="${BRANCH_NAME#refs/heads/}"

@andrewlock andrewlock Apr 24, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

FWIW, I'm pretty sure this line is not necessary, because this variable doesn't include the refs/heads/ prefix, but whatever

REF="refs/heads/$BRANCH_NAME"
else
echo "Label 'docker_image_artifacts' not found in PR — skipping Docker image build"
Expand Down Expand Up @@ -4358,6 +4359,7 @@ stages:
)
env:
GITHUB_TOKEN: $(retrieve_github_token.GITHUB_APP_TOKEN)
PR_SOURCE_BRANCH: $(System.PullRequest.SourceBranch)

- stage: coverage
condition: and(succeeded(), eq(variables['runCodeCoverage'], 'True'))
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/create-system-test-docker-base-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,15 @@ jobs:
- name: "Sanitize branch name"
id: image_tag
run: |
BRANCH="${{github.event.inputs.branch_name}}"
BRANCH="$BRANCH_NAME_INPUT"
if [[ -z "$BRANCH" ]]; then
echo "ERROR: Missing required 'branch_name' input. Aborting docker image build."
exit 1
fi
SAFE_TAG="${BRANCH//\//_}"
echo "tag=$SAFE_TAG" >> $GITHUB_OUTPUT
env:
BRANCH_NAME_INPUT: "${{ github.event.inputs.branch_name }}"

- uses: ./.github/actions/create-system-test-docker-base-images
name: 'Create system test docker images'
Expand Down
Loading