Fix template injection vulnerabilities in Setup MCPs steps #3130
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Template expressions in "Setup MCPs" steps were expanded directly in shell scripts (within TOML/JSON config files), creating code injection vulnerabilities. Fixed by moving template expansions to environment variables and referencing them using shell variable syntax.
Changes
Modified 5 files:
pkg/workflow/mcp-config.go- TOML config generationrenderSafeOutputsMCPConfigTOML(): Changed 6 env vars from"${{ env.VAR }}"→"${VAR}"renderAgenticWorkflowsMCPConfigTOML(): Changed"${{ secrets.GITHUB_TOKEN }}"→"${GH_AW_GITHUB_TOKEN_FOR_AGENTIC_WORKFLOWS}"renderSharedMCPConfig(): Added expression extraction/replacement for all MCP tool argspkg/workflow/codex_engine.go- GitHub MCP configGITHUB_PERSONAL_ACCESS_TOKEN = "${{ secrets... }}"→"${GITHUB_MCP_SERVER_TOKEN}"pkg/workflow/mcp_servers.go- Environment variable setupGITHUB_REPOSITORYandGITHUB_SERVER_URLto safe-outputs env blockextractExpressionsFromMCPToolArgs()to handle custom MCP tool arg expressionsUpdated test expectations in
codex_engine_test.goandmcp_config_refactor_test.goto match new format.Example
Before:
After:
Template expressions now only appear in the
env:block, preventing shell injection.Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.